From 27987f07f7c1c35abadc469ec336cbf91785cf20 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 2 Sep 2010 17:15:39 -0700
Subject: Don't use 'rezplat' command on opensim since it currently doesn't
 work on any OS-based grid

---
 linden/indra/newview/chatbar_as_cmdline.cpp | 3 ++-
 linden/indra/newview/floatercommandline.cpp | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 4e23b8a..aae4fbe 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -43,6 +43,7 @@
 #include "lluuid.h"
 #include "llviewercontrol.h"
 
+#include "hippoGridManager.h"
 #include "material_codes.h"
 #include "llvolume.h"
 #include "object_flags.h"
@@ -557,7 +558,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
 			{
 				gAgent.teleportHome();
 				return false;
-            }else if(command == *sCmdLineChatbarRezPlatform)
+			}else if(command == *sCmdLineChatbarRezPlatform && gHippoGridManager->getConnectedGrid()->isSecondLife())
             {
 				F32 width;
 				if (i >> width) cmdline_rezplat(false, width);
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;
 }
 
-- 
cgit v1.1