diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 222b5dbd4e..b645b3430d 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -250,8 +250,11 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
     LLTextBox* grid_mgr_help_text = getChild<LLTextBox>("grid_login_text");
     grid_mgr_help_text->setClickedCallback(onClickGridMgrHelp, NULL);
 
+#ifdef OPENSIM
     LLTextBox* grid_builder_text = getChild<LLTextBox>("grid_builder_text");
     grid_builder_text->setClickedCallback(onClickGridBuilder, NULL);
+    grid_builder_text->setVisible(true);
+#endif
 
     LLSLURL start_slurl(LLStartUp::getStartSLURL());
     // The StartSLURL might have been set either by an explicit command-line
diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index 52500edb4f..eb071fed6a 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -187,7 +187,8 @@
         height="16"
         name="grid_builder_text"
         left="5"
-        width="190">
+        width="190"
+        visible="false">
       + Click to add more grids
       </text>
       <text
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index a709af3ecb..edd1b2003e 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -291,7 +291,8 @@
       name="grid_builder_text"
       valign="center"
       left="45"
-      width="250">
+      width="250"
+      visible="false">
     + Click to add more grids
     </text>
     </layout_panel>