Resolve conflicts 2: Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / serverlist.qh

diff --git a/qcsrc/menu/xonotic/serverlist.qh b/qcsrc/menu/xonotic/serverlist.qh
index 77236e6d051d3590021ec1d35851e647053c850e..db74045986d7eb8b78bc06326639656a74addc4f 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qh
+++ b/qcsrc/menu/xonotic/serverlist.qh
@@ -63,6 +63,7 @@ CLASS(XonoticServerList, XonoticListBox)
        ATTRIB(XonoticServerList, seenIPv4, float, 0);
        ATTRIB(XonoticServerList, seenIPv6, float, 0);
        ATTRIB(XonoticServerList, categoriesHeight, float, 1.25);
+       ATTRIB(XonoticServerList, serversHeight, float, 1.0);
 
        METHOD(XonoticServerList, getTotalHeight, float(entity));
        METHOD(XonoticServerList, getItemAtPos, float(entity, float));