1 files changed, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/floatercommandline.cpp b/linden/indra/newview/floatercommandline.cpp
index a700b62..c093a58 100644
--- a/linden/indra/newview/floatercommandline.cpp
+++ b/linden/indra/newview/floatercommandline.cpp
@@ -32,6 +32,7 @@
 
 #include "floatercommandline.h"
 
+#include "hippoGridManager.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 
@@ -64,6 +65,14 @@ BOOL FloaterCommandLine::postBuild()
         childSetCommitCallback("CmdLineChatbarAO", onCommitApplyControl);
         childSetCommitCallback("CmdLineChatbarClearChat", onCommitApplyControl);
 
+        // hide options that don't work on non-SL-based grids
+        if (!gHippoGridManager->getConnectedGrid()->isSecondLife())
+        {
+                childSetEnabled("CmdLineChatbarRezPlatform", FALSE);
+                childSetEnabled("loltxt6", FALSE);
+                childSetEnabled("CmdLineChatbarPlatformSize", FALSE);
+        }
+
         return TRUE;
 }