Moved chatbar commandline options into their own window, cleaned up more stuff

11 files changed, 364 insertions, 325 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1a900c4..c047a0f 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
     emeraldboobutils.cpp
     floaterao.cpp
     floaterbusy.cpp
+    floatercommandline.cpp
     floatergriddefault.cpp
     floatergridmanager.cpp
     floaterlocalassetbrowse.cpp
@@ -514,6 +515,7 @@ set(viewer_HEADER_FILES
     emeraldboobutils.h
     floaterao.h
     floaterbusy.h
+    floatercommandline.h
     floatergriddefault.h
     floatergridmanager.h
     floaterlocalassetbrowse.h
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7071de2..f096811 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1312,7 +1312,7 @@
 
   <!-- Begin: chatbar_as_cmdline -->
 
-  <key>EmeraldCmdLine</key>
+  <key>CmdLineChatbarEnabled</key>
   <map>
     <key>Comment</key>
     <string>Enable usage of chat bar as a command line</string>
@@ -1323,7 +1323,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>EmeraldCmdLineMapToKeepPos</key>
+  <key>CmdLineChatbarMapToKeepPos</key>
   <map>
     <key>Comment</key>
     <string>Whether to use current local pos on tp to the new sim</string>
@@ -1334,7 +1334,7 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>EmeraldCmdLineAO</key>
+  <key>CmdLineChatbarAO</key>
   <map>
     <key>Comment</key>
     <string>Turn AO on/off</string>
@@ -1345,7 +1345,7 @@
     <key>Value</key>
     <string>cao</string>
   </map>
-  <key>EmeraldCmdLineAutocorrect</key>
+  <key>CmdLineChatbarAutocorrect</key>
   <map>
     <key>Comment</key>
     <string>Command for adding new entries to autocorrect</string>
@@ -1356,7 +1356,7 @@
     <key>Value</key>
     <string>/addac</string>
   </map>
-  <key>EmeraldCmdLineMedia</key>
+  <key>CmdLineChatbarMedia</key>
   <map>
     <key>Comment</key>
     <string>Chat command for setting a media url</string>
@@ -1367,7 +1367,7 @@
     <key>Value</key>
     <string>/media</string>
   </map>
-  <key>EmeraldCmdLineMusic</key>
+  <key>CmdLineChatbarMusic</key>
   <map>
     <key>Comment</key>
     <string>Chat command for setting a music url</string>
@@ -1378,7 +1378,7 @@
     <key>Value</key>
     <string>/music</string>
   </map>
-  <key>EmeraldCmdLineClearChat</key>
+  <key>CmdLineChatbarClearChat</key>
   <map>
     <key>Comment</key>
     <string>Clear chat hsitory to stop lag from chat spam</string>
@@ -1389,7 +1389,7 @@
     <key>Value</key>
     <string>clrchat</string>
   </map>
-  <key>EmeraldCmdLineHeight</key>
+  <key>CmdLineChatbarHeight</key>
   <map>
     <key>Comment</key>
     <string>Teleport to height function command</string>
@@ -1400,7 +1400,7 @@
     <key>Value</key>
     <string>gth</string>
   </map>
-  <key>EmeraldCmdLinePos</key>
+  <key>CmdLineChatbarPos</key>
   <map>
     <key>Comment</key>
     <string>Teleport to position function command</string>
@@ -1411,7 +1411,7 @@
     <key>Value</key>
     <string>gtp</string>
   </map>
-  <key>EmeraldCmdLineGround</key>
+  <key>CmdLineChatbarGround</key>
   <map>
     <key>Comment</key>
     <string>Teleport to ground function command</string>
@@ -1422,7 +1422,7 @@
     <key>Value</key>
     <string>flr</string>
   </map>
-  <key>EmeraldCmdLineTeleportHome</key>
+  <key>CmdLineChatbarTeleportHome</key>
   <map>
     <key>Comment</key>
     <string>Teleport to home function command</string>
@@ -1433,7 +1433,7 @@
     <key>Value</key>
     <string>tph</string>
   </map>
-  <key>EmeraldCmdLineRezPlatform</key>
+  <key>CmdLineChatbarRezPlatform</key>
   <map>
     <key>Comment</key>
     <string>Rez a platform underneath you</string>
@@ -1444,7 +1444,7 @@
     <key>Value</key>
     <string>rezplat</string>
   </map>
-  <key>EmeraldCmdLinePlatformSize</key>
+  <key>CmdLineChatbarPlatformSize</key>
   <map>
     <key>Comment</key>
     <string>How wide the rezzed platform will appear to be.</string>
@@ -1455,7 +1455,7 @@
     <key>Value</key>
     <real>30</real>
   </map>
-  <key>EmeraldCmdLineMapTo</key>
+  <key>CmdLineChatbarMapTo</key>
   <map>
     <key>Comment</key>
     <string>Teleport to a region by name rapidly</string>
@@ -1466,7 +1466,7 @@
     <key>Value</key>
     <string>mapto</string>
   </map>
-  <key>EmeraldCmdLineDrawDistance</key>
+  <key>CmdLineChatbarDrawDistance</key>
   <map>
     <key>Comment</key>
     <string>Change draw distance quickly</string>
@@ -1477,7 +1477,7 @@
     <key>Value</key>
     <string>dd</string>
   </map>
-  <key>EmeraldCmdTeleportToCam</key>
+  <key>CmdLineChatbarTeleportToCam</key>
   <map>
     <key>Comment</key>
     <string>Teleport to your camera</string>
@@ -1488,7 +1488,7 @@
     <key>Value</key>
     <string>tp2cam</string>
   </map>
-  <key>EmeraldCmdLineKeyToName</key>
+  <key>CmdLineChatbarKeyToName</key>
   <map>
     <key>Comment</key>
     <string>Use a fast key to name querry</string>
@@ -1499,7 +1499,7 @@
     <key>Value</key>
     <string>key2name</string>
   </map>
-  <key>EmeraldCmdLineOfferTp</key>
+  <key>CmdLineChatbarOfferTp</key>
   <map>
     <key>Comment</key>
     <string>Offer a teleport to target avatar</string>
@@ -1510,7 +1510,7 @@
     <key>Value</key>
     <string>offertp</string>
   </map>
-  <key>EmeraldCmdLineCalc</key>
+  <key>CmdLineChatbarCalc</key>
   <map>
     <key>Comment</key>
     <string>Calculates an expression</string>
@@ -1521,7 +1521,7 @@
     <key>Value</key>
     <string>calc</string>
   </map>
-  <key>EmeraldCmdLineTP2</key>
+  <key>CmdLineChatbarTP2</key>
   <map>
     <key>Comment</key>
     <string>Teleport to a person by name, partials work.</string>
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 61e4ef4..4e23b8a 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -50,7 +50,6 @@
 #include "llurldispatcher.h"
 #include "llworld.h"
 #include "llworldmap.h"
-//KOW #include "floateravatarlist.h"
 #include "floaterao.h"
 #include "llviewerobjectlist.h"
 #include "llviewertexteditor.h"
@@ -222,23 +221,23 @@ void invrepair()
         gInventory.collectDescendents(gAgent.getInventoryRootID(),cats,items,FALSE);//,objectnamematches);
 }
 
-/*static BOOL *sEmeraldCmdLine;
-static std::string *sEmeraldCmdLinePos;
-static std::string *sEmeraldCmdLineDrawDistance;
-static std::string *sEmeraldCmdTeleportToCam;
-static std::string *sEmeraldCmdLineAO;
-static std::string *sEmeraldCmdLineKeyToName;
-static std::string *sEmeraldCmdLineOfferTp;
-static std::string *sEmeraldCmdLineGround;
-static std::string *sEmeraldCmdLineHeight;
-static std::string *sEmeraldCmdLineTeleportHome;
-static std::string *sEmeraldCmdLineRezPlatform;
-static std::string *sEmeraldCmdLineMapTo;
-static BOOL *sEmeraldCmdLineMapToKeepPos;
-static std::string *sEmeraldCmdLineCalc;
-static std::string *sEmeraldCmdLineTP2;
-static std::string *sEmeraldCmdLineClearChat;
-static F32 *sEmeraldCmdLinePlatformSize;*/
+/*static BOOL *sCmdLineChatbarEnabled;
+static std::string *sCmdLineChatbarPos;
+static std::string *sCmdLineChatbarDrawDistance;
+static std::string *sCmdLineChatbarTeleportToCam;
+static std::string *sCmdLineChatbarAO;
+static std::string *sCmdLineChatbarKeyToName;
+static std::string *sCmdLineChatbarOfferTp;
+static std::string *sCmdLineChatbarGround;
+static std::string *sCmdLineChatbarHeight;
+static std::string *sCmdLineChatbarTeleportHome;
+static std::string *sCmdLineChatbarRezPlatform;
+static std::string *sCmdLineChatbarMapTo;
+static BOOL *sCmdLineChatbarMapToKeepPos;
+static std::string *sCmdLineChatbarCalc;
+static std::string *sCmdLineChatbarTP2;
+static std::string *sCmdLineChatbarClearChat;
+static F32 *sCmdLineChatbarPlatformSize;*/
 
 /*
 class another_rebind_group
@@ -264,36 +263,36 @@ std::map<std::string, int> get_gsaved_calls();
 
 bool cmd_line_chat(std::string revised_text, EChatType type)
 {
-        static BOOL *sEmeraldCmdLine = rebind_llcontrol<BOOL>("EmeraldCmdLine", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLinePos = rebind_llcontrol<std::string>("EmeraldCmdLinePos", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineDrawDistance = rebind_llcontrol<std::string>("EmeraldCmdLineDrawDistance", &gSavedSettings, true);
-        static std::string *sEmeraldCmdTeleportToCam = rebind_llcontrol<std::string>("EmeraldCmdTeleportToCam", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineAO = rebind_llcontrol<std::string>("EmeraldCmdLineAO", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineKeyToName = rebind_llcontrol<std::string>("EmeraldCmdLineKeyToName", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineOfferTp = rebind_llcontrol<std::string>("EmeraldCmdLineOfferTp", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineGround = rebind_llcontrol<std::string>("EmeraldCmdLineGround", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineHeight = rebind_llcontrol<std::string>("EmeraldCmdLineHeight", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineTeleportHome = rebind_llcontrol<std::string>("EmeraldCmdLineTeleportHome", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineRezPlatform = rebind_llcontrol<std::string>("EmeraldCmdLineRezPlatform", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineMapTo = rebind_llcontrol<std::string>("EmeraldCmdLineMapTo", &gSavedSettings, true);
-        static BOOL *sEmeraldCmdLineMapToKeepPos = rebind_llcontrol<BOOL>("EmeraldCmdLineMapToKeepPos", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineCalc = rebind_llcontrol<std::string>("EmeraldCmdLineCalc", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineTP2 = rebind_llcontrol<std::string>("EmeraldCmdLineTP2", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineClearChat = rebind_llcontrol<std::string>("EmeraldCmdLineClearChat", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineMedia = rebind_llcontrol<std::string>("EmeraldCmdLineMedia", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineMusic = rebind_llcontrol<std::string>("EmeraldCmdLineMusic", &gSavedSettings, true);
-        static std::string *sEmeraldCmdLineAutocorrect = rebind_llcontrol<std::string>("EmeraldCmdLineAutocorrect", &gSavedSettings, true);
-        //static std::string *sEmeraldCmdUndeform = rebind_llcontrol<std::string>("EmeraldCmdUndeform", &gSavedSettings, true);
-        //gSavedSettings.getString("EmeraldCmdUndeform")
+        static BOOL *sCmdLineChatbarEnabled = rebind_llcontrol<BOOL>("CmdLineChatbarEnabled", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarPos = rebind_llcontrol<std::string>("CmdLineChatbarPos", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarDrawDistance = rebind_llcontrol<std::string>("CmdLineChatbarDrawDistance", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarTeleportToCam = rebind_llcontrol<std::string>("CmdLineChatbarTeleportToCam", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarAO = rebind_llcontrol<std::string>("CmdLineChatbarAO", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarKeyToName = rebind_llcontrol<std::string>("CmdLineChatbarKeyToName", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarOfferTp = rebind_llcontrol<std::string>("CmdLineChatbarOfferTp", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarGround = rebind_llcontrol<std::string>("CmdLineChatbarGround", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarHeight = rebind_llcontrol<std::string>("CmdLineChatbarHeight", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarTeleportHome = rebind_llcontrol<std::string>("CmdLineChatbarTeleportHome", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarRezPlatform = rebind_llcontrol<std::string>("CmdLineChatbarRezPlatform", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarMapTo = rebind_llcontrol<std::string>("CmdLineChatbarMapTo", &gSavedSettings, true);
+        static BOOL *sCmdLineChatbarMapToKeepPos = rebind_llcontrol<BOOL>("CmdLineChatbarMapToKeepPos", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarCalc = rebind_llcontrol<std::string>("CmdLineChatbarCalc", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarTP2 = rebind_llcontrol<std::string>("CmdLineChatbarTP2", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarClearChat = rebind_llcontrol<std::string>("CmdLineChatbarClearChat", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarMedia = rebind_llcontrol<std::string>("CmdLineChatbarMedia", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarMusic = rebind_llcontrol<std::string>("CmdLineChatbarMusic", &gSavedSettings, true);
+        static std::string *sCmdLineChatbarAutocorrect = rebind_llcontrol<std::string>("CmdLineChatbarAutocorrect", &gSavedSettings, true);
+        //static std::string *sCmdLineChatbarUndeform = rebind_llcontrol<std::string>("CmdLineChatbarUndeform", &gSavedSettings, true);
+        //gSavedSettings.getString("CmdLineChatbarUndeform")
         
-        if(*sEmeraldCmdLine)
+        if(*sCmdLineChatbarEnabled)
         {
                 std::istringstream i(revised_text);
                 std::string command;
                 i >> command;
                 if(command != "")
                 {
-                        if(command == *sEmeraldCmdLinePos)
+                        if(command == *sCmdLineChatbarPos)
                         {
                                 F32 x,y,z;
                                 if (i >> x)
@@ -316,7 +315,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         }
                                 }
                         }
-                        else if(command == *sEmeraldCmdLineDrawDistance)
+                        else if(command == *sCmdLineChatbarDrawDistance)
                         {
                 int drawDist;
                 if(i >> drawDist)
@@ -329,18 +328,18 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         return false;
                 }
                         }
-                        else if(command == *sEmeraldCmdTeleportToCam)
+                        else if(command == *sCmdLineChatbarTeleportToCam)
             {
                                 gAgent.teleportViaLocation(gAgent.getCameraPositionGlobal());
                                 return false;
             }
-                        /*else if(command == *sEmeraldCmdUndeform)
+                        /*else if(command == *sCmdLineChatbarUndeform)
             {
                                 llinfos << "UNDEFORM: Do you feel your bones cracking back into place?" << llendl;
                                 gAgent.getAvatarObject()->undeform();
                                 return false;
             }*/ //what the fuck is this shit, thought it would be something useful like repairing the skeleton but its some shitty playing of inworld anims
-                        else if(command == *sEmeraldCmdLineMedia)
+                        else if(command == *sCmdLineChatbarMedia)
                         {
                                 std::string url;
                                 std::string type;
@@ -358,7 +357,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         }
                                 }
                         }
-                        else if(command == *sEmeraldCmdLineMusic)
+                        else if(command == *sCmdLineChatbarMusic)
                         {
                                 std::string status;
                                 if(i >> status)
@@ -371,7 +370,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         return false;
                                 }
                         }
-                        else if(command == *sEmeraldCmdLineAO)
+                        else if(command == *sCmdLineChatbarAO)
             {
                                 std::string status;
                 if(i >> status)
@@ -394,7 +393,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                 }
                                 return false;
             }
-                        else if(command == *sEmeraldCmdLineKeyToName)
+                        else if(command == *sCmdLineChatbarKeyToName)
             {
                 LLUUID targetKey;
                 if(i >> targetKey)
@@ -496,7 +495,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                 cmdline_printchat(std::string("Standing up"));
                                 return false;
             }
-                        else if(command == *sEmeraldCmdLineOfferTp)
+                        else if(command == *sCmdLineChatbarOfferTp)
             {
                 std::string avatarKey;
 //                              llinfos << "CMD DEBUG 0 " << command << " " << avatarName << llendl;
@@ -532,7 +531,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                 }
             }
                         
-                        else if(command == *sEmeraldCmdLineGround)
+                        else if(command == *sCmdLineChatbarGround)
                         {
                                 LLVector3 agentPos = gAgent.getPositionAgent();
                                 U64 agentRegion = gAgent.getRegion()->getHandle();
@@ -541,7 +540,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                 pos_global += LLVector3d((F64)targetPos.mV[0],(F64)targetPos.mV[1],(F64)targetPos.mV[2]);
                                 gAgent.teleportViaLocation(pos_global);
                                 return false;
-                        }else if(command == *sEmeraldCmdLineHeight)
+                        }else if(command == *sCmdLineChatbarHeight)
                         {
                                 F32 z;
                                 if(i >> z)
@@ -554,17 +553,17 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         gAgent.teleportViaLocation(pos_global);
                                         return false;
                                 }
-                        }else if(command == *sEmeraldCmdLineTeleportHome)
+                        }else if(command == *sCmdLineChatbarTeleportHome)
                         {
                                 gAgent.teleportHome();
                                 return false;
-            }else if(command == *sEmeraldCmdLineRezPlatform)
+            }else if(command == *sCmdLineChatbarRezPlatform)
             {
                                 F32 width;
                                 if (i >> width) cmdline_rezplat(false, width);
                                 else cmdline_rezplat();
                                 return false;
-                        }else if(command == *sEmeraldCmdLineMapTo)
+                        }else if(command == *sCmdLineChatbarMapTo)
                         {
                                 if (revised_text.length() > command.length() + 1) //Typing this command with no argument was causing a crash. -Madgeek
                                 {
@@ -575,7 +574,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         std::string region_name = LLWeb::escapeURL(revised_text.substr(command.length()+1));
                                         std::string url;
 
-                                        if(!*sEmeraldCmdLineMapToKeepPos)
+                                        if(!*sCmdLineChatbarMapToKeepPos)
                                         {
                                                 agent_x = 128;
                                                 agent_y = 128;
@@ -586,7 +585,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         LLURLDispatcher::dispatch(url, NULL, true);
                                 }
                                 return false;
-                        }else if(command == *sEmeraldCmdLineCalc)//Cryogenic Blitz
+                        }else if(command == *sCmdLineChatbarCalc)//Cryogenic Blitz
                         {
                                 bool success;
                                 F32 result = 0.f;
@@ -615,7 +614,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         cmdline_printchat(out);
                                         return false;
                                 }
-                        }else if(command == *sEmeraldCmdLineTP2)
+                        }else if(command == *sCmdLineChatbarTP2)
                         {
                                 if (revised_text.length() > command.length() + 1) //Typing this command with no argument was causing a crash. -Madgeek
                                 {
@@ -630,22 +629,22 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                 cmdline_printchat("Displaying AutoCorrection Floater.");
                                 return false;
                         }
-                        else if(command == *sEmeraldCmdLineAutocorrect)
+                        else if(command == *sCmdLineChatbarAutocorrect)
                         {
                                 if (revised_text.length() <= command.length() + 1) //KOW: verify that we have params
                                 {
                                         cmdline_printchat("No parameter specified, correct usage is "+
-                                                *sEmeraldCmdLineAutocorrect+" list Name|wrong word|right word.");
+                                                *sCmdLineChatbarAutocorrect+" list Name|wrong word|right word.");
                                         return false;
                                 }
 
-                                std::string info = revised_text.substr((*sEmeraldCmdLineAutocorrect).length()+1);
+                                std::string info = revised_text.substr((*sCmdLineChatbarAutocorrect).length()+1);
                                 //addac list name|wrong word|right word
                                 int bar = info.find("|");
                                 if (bar==std::string::npos)
                                 {
                                         cmdline_printchat("Wrong usage, correct usage is "+
-                                *sEmeraldCmdLineAutocorrect+" list name|wrong word|right word.");
+                                *sCmdLineChatbarAutocorrect+" list name|wrong word|right word.");
                                         return false;
                                 }
                                 
@@ -657,7 +656,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                 if (bar==std::string::npos)
                                 {
                                         cmdline_printchat("Wrong usage, correct usage is"+
-                                                *sEmeraldCmdLineAutocorrect+" list name|wrong word|right word.");
+                                                *sCmdLineChatbarAutocorrect+" list name|wrong word|right word.");
                                         return false;
                                 }
 
@@ -683,7 +682,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
 //                              //gAgent.getAvatarObject()->loadAvatar();
 //                              return false;
 //                      }
-                        else if(command == *sEmeraldCmdLineClearChat)
+                        else if(command == *sCmdLineChatbarClearChat)
                         {
                                 LLFloaterChat* chat = LLFloaterChat::getInstance(LLSD());
                                 if(chat)
@@ -930,9 +929,9 @@ void cmdline_rezplat(bool use_saved_value, F32 visual_radius) //cmdline_rezplat(
     LLQuaternion rotation;
     rotation.setQuat(90.f * DEG_TO_RAD, LLVector3::y_axis);
 
-        static F32 *sEmeraldCmdLinePlatformSize = rebind_llcontrol<F32>("EmeraldCmdLinePlatformSize", &gSavedSettings, true);
+        static F32 *sCmdLineChatbarPlatformSize = rebind_llcontrol<F32>("CmdLineChatbarPlatformSize", &gSavedSettings, true);
 
-        if (use_saved_value) visual_radius = *sEmeraldCmdLinePlatformSize;
+        if (use_saved_value) visual_radius = *sCmdLineChatbarPlatformSize;
         F32 realsize = visual_radius / 3.0f;
         if (realsize < 0.01f) realsize = 0.01f;
         else if (realsize > 10.0f) realsize = 10.0f;
diff --git a/linden/indra/newview/floatercommandline.cpp b/linden/indra/newview/floatercommandline.cpp
new file mode 100644
index 0000000..a700b62
--- /dev/null
+++ b/linden/indra/newview/floatercommandline.cpp
@@ -0,0 +1,84 @@
+/**
+* @file floatercommandline.cpp
+* @brief change chatbar as a commandline preferences in Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "floatercommandline.h"
+
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+
+FloaterCommandLine::FloaterCommandLine(const LLSD& seed) : LLFloater("floater_command_line")
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_command_line.xml");
+}
+
+FloaterCommandLine::~FloaterCommandLine()
+{
+}
+
+BOOL FloaterCommandLine::postBuild()
+{
+        childSetAction("Help_CmdLine", onClickHelp, this);
+
+        childSetCommitCallback("CmdLineChatbarPos", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarGround", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarHeight", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarTeleportHome", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarRezPlatform", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarMapTo", onCommitApplyControl);    
+        childSetCommitCallback("CmdLineChatbarCalc", onCommitApplyControl);
+
+        childSetCommitCallback("CmdLineChatbarDrawDistance", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarTeleportToCam", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarKeyToName", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarOfferTp", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarTP2", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarAO", onCommitApplyControl);
+        childSetCommitCallback("CmdLineChatbarClearChat", onCommitApplyControl);
+
+        return TRUE;
+}
+
+//workaround for lineeditor dumbness in regards to control_name
+void FloaterCommandLine::onCommitApplyControl(LLUICtrl* caller, void* user_data)
+{
+        LLLineEditor* line = (LLLineEditor*)caller;
+        if(line)
+        {
+                LLControlVariable *var = line->findControl(line->getControlName());
+                if(var)var->setValue(line->getValue());
+        }
+}
+
+void FloaterCommandLine::onClickHelp(void* data)
+{
+        LLNotifications::instance().add("Help_CmdLine");
+}
diff --git a/linden/indra/newview/floatercommandline.h b/linden/indra/newview/floatercommandline.h
new file mode 100644
index 0000000..9d140eb
--- /dev/null
+++ b/linden/indra/newview/floatercommandline.h
@@ -0,0 +1,55 @@
+/**
+* @file floatercommandline.h
+* @brief change chatbar as a commandline preferences in Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2010, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef FLOATERCOMMANDLINE_H
+#define FLOATERCOMMANDLINE_H
+
+#include "llfloater.h"
+
+class FloaterCommandLine : public LLFloater, public LLFloaterSingleton<FloaterCommandLine>
+{
+public:
+        FloaterCommandLine(const LLSD& seed);
+        virtual ~FloaterCommandLine();
+
+        BOOL postBuild();
+
+        //void apply();
+        //void cancel();
+
+private:
+        //static void onClickOK(void* userdata);
+        //static void onClickCancel(void* userdata);
+        static void onCommitApplyControl(LLUICtrl* caller, void* user_data);
+
+        static void onClickHelp(void* data);
+};
+
+#endif // FLOATERCOMMANDLINE_H
diff --git a/linden/indra/newview/lggautocorrectfloater.cpp b/linden/indra/newview/lggautocorrectfloater.cpp
index 9d68b25..1690eaf 100644
--- a/linden/indra/newview/lggautocorrectfloater.cpp
+++ b/linden/indra/newview/lggautocorrectfloater.cpp
@@ -49,6 +49,7 @@
 #include "llcheckboxctrl.h"
 #include "llviewercontrol.h"
 
+#include "floaterbusy.h" // InvDropTarget
 #include "llui.h"
 #include "llcontrol.h"
 #include "llscrolllistctrl.h"
@@ -89,7 +90,7 @@ public:
         LLPrefsAdvanced * empanel;
 private:
         static lggAutoCorrectFloater* sInstance;
-        static JCInvDropTarget* mNotecardDropTarget;
+        static InvDropTarget* mNotecardDropTarget;
         static void onBoxCommitEnabled(LLUICtrl* caller, void* user_data);
         static void onEntrySettingChange(LLUICtrl* caller, void* user_data);
         static void onSelectName(LLUICtrl* caller, void* user_data);
@@ -107,7 +108,7 @@ private:
 
 
 
-JCInvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget;
+InvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget;
 lggAutoCorrectFloater* lggAutoCorrectFloater::sInstance;
 
 lggAutoCorrectFloater::~lggAutoCorrectFloater()
@@ -165,7 +166,7 @@ BOOL lggAutoCorrectFloater::postBuild(void)
                 {
                         delete mNotecardDropTarget;
                 }
-                mNotecardDropTarget = new JCInvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID);
+                mNotecardDropTarget = new InvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID);
                 addChild(mNotecardDropTarget);
         }
         return true;
@@ -429,7 +430,7 @@ void lggAutoCorrectFloater::addEntry(void* data)
 {
         std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
         LLChat chat;
-        chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("EmeraldCmdLineAutocorrect")+" "+listName+"|wrongWord|rightWord\"";
+        chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("CmdLineChatbarAutocorrect")+" "+listName+"|wrongWord|rightWord\"";
         chat.mSourceType = CHAT_SOURCE_SYSTEM;
         LLFloaterChat::addChat(chat, FALSE, FALSE);
 }
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 4a4b299..7fa694c 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -32,6 +32,7 @@
 
 #include "llcombobox.h"
 
+#include "floatercommandline.h"
 #include "llagent.h"
 #include "llprefsadvanced.h"
 #include "llviewercontrol.h"
@@ -43,76 +44,6 @@
 
 #include "lluictrlfactory.h"
 
-////////begin drop utility/////////////
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class JCInvDropTarget
-//
-// This handy class is a simple way to drop something on another
-// view. It handles drop events, always setting itself to the size of
-// its parent.
-//
-// altered to support a callback so i can slap it in things and it just return the item to a func of my choice
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-
-
-JCInvDropTarget::JCInvDropTarget(const std::string& name, const LLRect& rect,
-                                                                 void (*callback)(LLViewerInventoryItem*)) :
-LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
-mDownCallback(callback)
-{
-}
-
-JCInvDropTarget::~JCInvDropTarget()
-{
-}
-
-void JCInvDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
-{
-        llinfos << "JCInvDropTarget::doDrop()" << llendl;
-}
-
-BOOL JCInvDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-                                                                                EDragAndDropType cargo_type,
-                                                                                void* cargo_data,
-                                                                                EAcceptance* accept,
-                                                                                std::string& tooltip_msg)
-{
-        BOOL handled = FALSE;
-        if(getParent())
-        {
-                handled = TRUE;
-                // check the type
-                //switch(cargo_type)
-                //{
-                //case DAD_ANIMATION:
-                //{
-                LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
-                if(gInventory.getItem(inv_item->getUUID()))
-                {
-                        *accept = ACCEPT_YES_COPY_SINGLE;
-                        if(drop)
-                        {
-                                //printchat("accepted");
-                                mDownCallback(inv_item);
-                        }
-                }
-                else
-                {
-                        *accept = ACCEPT_NO;
-                }
-                //      break;
-                //}
-                //default:
-                //      *accept = ACCEPT_NO;
-                //      break;
-                //}
-        }
-        return handled;
-}
-////////end drop utility///////////////
-
 LLPrefsAdvanced* LLPrefsAdvanced::sInstance;
 
 LLPrefsAdvanced::LLPrefsAdvanced()
@@ -124,6 +55,7 @@ LLPrefsAdvanced::LLPrefsAdvanced()
         childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
 
         childSetAction("reset_btn", onClickResetPrefs, this);
+        childSetAction("command_line_btn", onClickCommandLine, this);
 }
 
 LLPrefsAdvanced::~LLPrefsAdvanced()
@@ -160,6 +92,7 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose"));
         childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC"));
         childSetValue("shadows_check", gSavedSettings.getBOOL("ShadowsEnabled"));
+        childSetValue("command_line_check", gSavedSettings.getBOOL("CmdLineChatbarEnabled"));
 
         childSetValue("lightshare_combo",
                       LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
@@ -167,22 +100,6 @@ BOOL LLPrefsAdvanced::postBuild()
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
 
-        childSetCommitCallback("EmeraldCmdLinePos", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineGround", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineHeight", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineTeleportHome", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineRezPlatform", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineMapTo", onCommitApplyControl);    
-        childSetCommitCallback("EmeraldCmdLineCalc", onCommitApplyControl);
-
-        childSetCommitCallback("EmeraldCmdLineDrawDistance", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdTeleportToCam", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineKeyToName", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineOfferTp", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineTP2", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineAO", onCommitApplyControl);
-        childSetCommitCallback("EmeraldCmdLineClearChat", onCommitApplyControl);
-
         getChild<LLComboBox>("EmeraldSpellBase")->setCommitCallback(onSpellBaseComboBoxCommit);
         getChild<LLButton>("EmSpell_EditCustom")->setClickedCallback(onSpellEditCustom, this);
         getChild<LLButton>("EmSpell_GetMore")->setClickedCallback(onSpellGetMore, this);
@@ -191,7 +108,6 @@ BOOL LLPrefsAdvanced::postBuild()
 
         getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton,this);
 
-        initHelpBtn("EmeraldHelp_CmdLine",                      "EmeraldHelp_CmdLine");
         initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
 
         refresh();
@@ -277,6 +193,8 @@ void LLPrefsAdvanced::apply()
                 build_pie_menus();
         }
 
+        gSavedSettings.setBOOL("CmdLineChatbarEnabled", childGetValue("command_line_check").asBoolean());
+
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
 }
@@ -362,17 +280,6 @@ bool LLPrefsAdvanced::callbackReset(const LLSD& notification, const LLSD& respon
         return false;
 }
 
-//workaround for lineeditor dumbness in regards to control_name
-void LLPrefsAdvanced::onCommitApplyControl(LLUICtrl* caller, void* user_data)
-{
-        LLLineEditor* line = (LLLineEditor*)caller;
-        if(line)
-        {
-                LLControlVariable *var = line->findControl(line->getControlName());
-                if(var)var->setValue(line->getValue());
-        }
-}
-
 void LLPrefsAdvanced::onSpellAdd(void* data)
 {
         LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
@@ -416,4 +323,10 @@ void LLPrefsAdvanced::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
 void LLPrefsAdvanced::onAutoCorrectButton(void * data)
 {
         lggAutoCorrectFloaterStart::show(TRUE,data);
-}
\ No newline at end of file
+}
+
+void LLPrefsAdvanced::onClickCommandLine(void* data)
+{
+        FloaterCommandLine::getInstance()->open();
+        FloaterCommandLine::getInstance()->center();
+}
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index 6a15fba..84a7854 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -34,25 +34,6 @@
 #include "llpanel.h"
 #include "llviewerinventory.h"
 
-class JCInvDropTarget : public LLView
-{
-public:
-        JCInvDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*));
-        ~JCInvDropTarget();
-
-        void doDrop(EDragAndDropType cargo_type, void* cargo_data);
-
-        //
-        // LLView functionality
-        virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-                EDragAndDropType cargo_type,
-                void* cargo_data,
-                EAcceptance* accept,
-                std::string& tooltip_msg);
-protected:
-        void    (*mDownCallback)(LLViewerInventoryItem*);
-};
-
 class LLPrefsAdvanced : public LLPanel
 {
 public:
@@ -70,11 +51,10 @@ private:
 
         static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
         static void onClickResetPrefs(void* user_data);
+        static void onClickCommandLine(void* data);
 
         static bool     callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self);
 
-        static void onCommitApplyControl(LLUICtrl* caller, void* user_data);
-
         static void onSpellAdd(void* data);
         static void onSpellRemove(void* data);
         static void onSpellGetMore(void* data);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
new file mode 100644
index 0000000..35f47b5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="busy" title="Chatbar Commands"
+         height="400" width="500"
+         follows="top|right" can_close="true" can_drag_on_left="false"
+         can_minimize="true" can_resize="false" can_tear_off="false">
+  <text bottom="-55" follows="left|top" font="SansSerifSmall" height="16" left="15"
+     name="loltxt2" width="512">        Teleport within sim (usage: cmd x y z)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarPos" control_name="CmdLineChatbarPos" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt3" width="512">        Teleport to ground (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarGround" control_name="CmdLineChatbarGround" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt4" width="512">        Teleport to altitude (usage: cmd z)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarHeight" control_name="CmdLineChatbarHeight" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt5" width="512">        Teleport home (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarTeleportHome" control_name="CmdLineChatbarTeleportHome"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt6" width="512">        Rez a platform (usage: cmd 0 - 30)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarRezPlatform" control_name="CmdLineChatbarRezPlatform"
+     width="200"/>
+  <slider bottom_delta="-20" left="20" name="CmdLineChatbarPlatformSize" control_name="CmdLineChatbarPlatformSize"
+     decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
+     initial_val="5" label="Width" label_width="30" max_val="30" min_val="5"
+     mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
+  <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left="15"
+     name="loltxt7" width="512">        Teleport to sim x (usage: cmd simname)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarMapTo" control_name="CmdLineChatbarMapTo" width="200"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
+     name="toggle" radio_style="false" width="270" control_name="CmdLineChatbarMapToKeepPos"/>
+  <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt8" width="512">        Calc. expressions (usage: cmd SIN(2+2))</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarCalc" control_name="CmdLineChatbarCalc" width="200"/>
+  <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     width="512">Add autocorrect word(cmd list|bad|good)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarAutocorrect" control_name="CmdLineChatbarAutocorrect" width="200"/>
+
+  <text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="230"
+     name="loltxt9" width="512">        Change Draw Distance (usage: cmd meters)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarDrawDistance" control_name="CmdLineChatbarDrawDistance"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt10" width="512">        Teleport to cam position (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarTeleportToCam" control_name="CmdLineChatbarTeleportToCam"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt11" width="512">        Get avatar name from key (usage: cmd key)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarKeyToName" control_name="CmdLineChatbarKeyToName"
+     width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt12" width="512">        Offer teleport to avatar (usage: cmd key)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarOfferTp" control_name="CmdLineChatbarOfferTp" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt13" width="512">        Teleport to avatar (usage: cmd name)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
+     name="CmdLineChatbarTP2" control_name="CmdLineChatbarTP2" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt14" width="512">        Turn AO on/off (usage: cmd on/off)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="" name="CmdLineChatbarAO" control_name="CmdLineChatbarAO" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+     name="loltxt15" width="512">        Clear the chat history (usage: cmd)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+     font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+     tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="CmdLineChatbarClearChat" control_name="CmdLineChatbarClearChat" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="loltxt15" width="512">        Set the media url (usage: cmd url type)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="Sets and plays your media stream to the entered url" name="CmdLineChatbarMedia" control_name="CmdLineChatbarMedia" width="200"/>
+  <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="loltxt15" width="512">        Set the music stream url (usage: cmd url)</text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="sets and plays your music stream to the entered url" name="CmdLineChatbarMusic" control_name="CmdLineChatbarMusic" width="200"/>
+  <button bottom="-40" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        name="Help_CmdLine" tool_tip="Click here for help regarding the settings in this page."
+        right="-10" width="18"/>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 4bb2274..9952d25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7053,12 +7053,12 @@ Note: To comply with the Second Life Terms of Service, Imprudence did not downlo
 </notification>
 
 <notification
- icon="alertmodal.tga"
- label="Emerald Help"
- name="EmeraldHelp_CmdLine"
- type="alertmodal">
-Various Options For Command Line features.
-To use a command, type it in your chat bar (Local chat) and press enter.
+ icon="alert.tga"
+ name="Help_CmdLine"
+ type="alert">
+Various options for command line features.
+
+To use a command, type it in your chat bar (Local Chat) and press enter.
 </notification>
   
 <notification
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index b86d1c2..a164f78 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -98,6 +98,12 @@
        mouse_opaque="true" name="auto_close_ooc"
        radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
        width="256" />
+  <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="false" label="Use the chatbar as a command line" left="12"
+       mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
+  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" width="150"
+       label="Chatbar Commands" name="command_line_btn" left="12"
+       tool_tip="Set specific chatbar command line commands here" />
 
   <!-- Uncomment when we start using the crash logger - MC -->
   <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -120,119 +126,10 @@
     </combo_item>
   </combo_box>-->
 
-      <button bottom="30" follows="left|top" font="SansSerifSmall" height="20" width="250" 
+    <button bottom="30" follows="left|top" font="SansSerifSmall" height="20" width="250" 
            label="Reset All Preferences To Default" name="reset_btn" left="12" 
            tool_tip="Reset all preferences to their default values (requires a restart)" />
     </panel>
-
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="CmdLine"
-       left="1" mouse_opaque="true" name="CmdLine" width="418">
-      <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
-         name="EmeraldHelp_CmdLine" tool_tip="Click here for help regarding the settings in this page."
-         right="490" width="18"/>
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         initial_value="false" label="Enable usage of chat bar as a command line" left="5"
-         mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270" control_name="EmeraldCmdLine"/>
-      <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-         name="loltxt2" width="512">        Teleport within sim (usage: cmd x y z)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLinePos" control_name="EmeraldCmdLinePos" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt3" width="512">        Teleport to ground (usage: cmd)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineGround" control_name="EmeraldCmdLineGround" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt4" width="512">        Teleport to altitude (usage: cmd z)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineHeight" control_name="EmeraldCmdLineHeight" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt5" width="512">        Teleport home (usage: cmd)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineTeleportHome" control_name="EmeraldCmdLineTeleportHome"
-         width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt6" width="512">        Rez a platform (usage: cmd 0 - 30)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineRezPlatform" control_name="EmeraldCmdLineRezPlatform"
-         width="200"/>
-      <slider bottom_delta="-20" left="15" name="EmeraldCmdLinePlatformSize" control_name="EmeraldCmdLinePlatformSize"
-         decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
-         initial_val="5" label="Width" label_width="30" max_val="30" min_val="5"
-         mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
-      <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt7" width="512">        Teleport to sim x (usage: cmd simname)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineMapTo" control_name="EmeraldCmdLineMapTo" width="200"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-         initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
-         name="toggle" radio_style="false" width="270" control_name="EmeraldCmdLineMapToKeepPos"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt8" width="512">        Calc. expressions (usage: cmd SIN(2+2))</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineCalc" control_name="EmeraldCmdLineCalc" width="200"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         width="512">Add autocorrect word(cmd list|bad|good)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineAutocorrect" control_name="EmeraldCmdLineAutocorrect" width="200"/>
-
-      <text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="230"
-         name="loltxt9" width="512">        Change Draw Distance (usage: cmd meters)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineDrawDistance" control_name="EmeraldCmdLineDrawDistance"
-         width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt10" width="512">        Teleport to cam position (usage: cmd)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdTeleportToCam" control_name="EmeraldCmdTeleportToCam"
-         width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt11" width="512">        Get avatar name from key (usage: cmd key)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineKeyToName" control_name="EmeraldCmdLineKeyToName"
-         width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt12" width="512">        Offer teleport to avatar (usage: cmd key)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineOfferTp" control_name="EmeraldCmdLineOfferTp" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt13" width="512">        Teleport to avatar (usage: cmd name)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
-         name="EmeraldCmdLineTP2" control_name="EmeraldCmdLineTP2" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt14" width="512">        Turn AO on/off (usage: cmd on/off)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="" name="EmeraldCmdLineAO" control_name="EmeraldCmdLineAO" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-         name="loltxt15" width="512">        Clear the chat history (usage: cmd)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-         font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-         tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="EmeraldCmdLineClearChat" control_name="EmeraldCmdLineClearChat" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-            name="loltxt15" width="512">        Set the media url (usage: cmd url type)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-            font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-            tool_tip="Sets and plays your media stream to the entered url" name="EmeraldCmdLineMedia" control_name="EmeraldCmdLineMedia" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-            name="loltxt15" width="512">        Set the music stream url (usage: cmd url)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-            font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-            tool_tip="sets and plays your music stream to the entered url" name="EmeraldCmdLineMusic" control_name="EmeraldCmdLineMusic" width="200"/>
-    </panel>
     
     <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
        left="1" mouse_opaque="true" name="SpellCheck" width="418">