aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/CMakeLists.txt2
-rw-r--r--linden/indra/newview/app_settings/settings.xml40
-rw-r--r--linden/indra/newview/chatbar_as_cmdline.cpp129
-rw-r--r--linden/indra/newview/floatercommandline.cpp84
-rw-r--r--linden/indra/newview/floatercommandline.h55
-rw-r--r--linden/indra/newview/lggautocorrectfloater.cpp9
-rw-r--r--linden/indra/newview/llprefsadvanced.cpp111
-rw-r--r--linden/indra/newview/llprefsadvanced.h22
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml108
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml12
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml117
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
78 emeraldboobutils.cpp 78 emeraldboobutils.cpp
79 floaterao.cpp 79 floaterao.cpp
80 floaterbusy.cpp 80 floaterbusy.cpp
81 floatercommandline.cpp
81 floatergriddefault.cpp 82 floatergriddefault.cpp
82 floatergridmanager.cpp 83 floatergridmanager.cpp
83 floaterlocalassetbrowse.cpp 84 floaterlocalassetbrowse.cpp
@@ -514,6 +515,7 @@ set(viewer_HEADER_FILES
514 emeraldboobutils.h 515 emeraldboobutils.h
515 floaterao.h 516 floaterao.h
516 floaterbusy.h 517 floaterbusy.h
518 floatercommandline.h
517 floatergriddefault.h 519 floatergriddefault.h
518 floatergridmanager.h 520 floatergridmanager.h
519 floaterlocalassetbrowse.h 521 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 @@
1312 1312
1313 <!-- Begin: chatbar_as_cmdline --> 1313 <!-- Begin: chatbar_as_cmdline -->
1314 1314
1315 <key>EmeraldCmdLine</key> 1315 <key>CmdLineChatbarEnabled</key>
1316 <map> 1316 <map>
1317 <key>Comment</key> 1317 <key>Comment</key>
1318 <string>Enable usage of chat bar as a command line</string> 1318 <string>Enable usage of chat bar as a command line</string>
@@ -1323,7 +1323,7 @@
1323 <key>Value</key> 1323 <key>Value</key>
1324 <integer>1</integer> 1324 <integer>1</integer>
1325 </map> 1325 </map>
1326 <key>EmeraldCmdLineMapToKeepPos</key> 1326 <key>CmdLineChatbarMapToKeepPos</key>
1327 <map> 1327 <map>
1328 <key>Comment</key> 1328 <key>Comment</key>
1329 <string>Whether to use current local pos on tp to the new sim</string> 1329 <string>Whether to use current local pos on tp to the new sim</string>
@@ -1334,7 +1334,7 @@
1334 <key>Value</key> 1334 <key>Value</key>
1335 <integer>0</integer> 1335 <integer>0</integer>
1336 </map> 1336 </map>
1337 <key>EmeraldCmdLineAO</key> 1337 <key>CmdLineChatbarAO</key>
1338 <map> 1338 <map>
1339 <key>Comment</key> 1339 <key>Comment</key>
1340 <string>Turn AO on/off</string> 1340 <string>Turn AO on/off</string>
@@ -1345,7 +1345,7 @@
1345 <key>Value</key> 1345 <key>Value</key>
1346 <string>cao</string> 1346 <string>cao</string>
1347 </map> 1347 </map>
1348 <key>EmeraldCmdLineAutocorrect</key> 1348 <key>CmdLineChatbarAutocorrect</key>
1349 <map> 1349 <map>
1350 <key>Comment</key> 1350 <key>Comment</key>
1351 <string>Command for adding new entries to autocorrect</string> 1351 <string>Command for adding new entries to autocorrect</string>
@@ -1356,7 +1356,7 @@
1356 <key>Value</key> 1356 <key>Value</key>
1357 <string>/addac</string> 1357 <string>/addac</string>
1358 </map> 1358 </map>
1359 <key>EmeraldCmdLineMedia</key> 1359 <key>CmdLineChatbarMedia</key>
1360 <map> 1360 <map>
1361 <key>Comment</key> 1361 <key>Comment</key>
1362 <string>Chat command for setting a media url</string> 1362 <string>Chat command for setting a media url</string>
@@ -1367,7 +1367,7 @@
1367 <key>Value</key> 1367 <key>Value</key>
1368 <string>/media</string> 1368 <string>/media</string>
1369 </map> 1369 </map>
1370 <key>EmeraldCmdLineMusic</key> 1370 <key>CmdLineChatbarMusic</key>
1371 <map> 1371 <map>
1372 <key>Comment</key> 1372 <key>Comment</key>
1373 <string>Chat command for setting a music url</string> 1373 <string>Chat command for setting a music url</string>
@@ -1378,7 +1378,7 @@
1378 <key>Value</key> 1378 <key>Value</key>
1379 <string>/music</string> 1379 <string>/music</string>
1380 </map> 1380 </map>
1381 <key>EmeraldCmdLineClearChat</key> 1381 <key>CmdLineChatbarClearChat</key>
1382 <map> 1382 <map>
1383 <key>Comment</key> 1383 <key>Comment</key>
1384 <string>Clear chat hsitory to stop lag from chat spam</string> 1384 <string>Clear chat hsitory to stop lag from chat spam</string>
@@ -1389,7 +1389,7 @@
1389 <key>Value</key> 1389 <key>Value</key>
1390 <string>clrchat</string> 1390 <string>clrchat</string>
1391 </map> 1391 </map>
1392 <key>EmeraldCmdLineHeight</key> 1392 <key>CmdLineChatbarHeight</key>
1393 <map> 1393 <map>
1394 <key>Comment</key> 1394 <key>Comment</key>
1395 <string>Teleport to height function command</string> 1395 <string>Teleport to height function command</string>
@@ -1400,7 +1400,7 @@
1400 <key>Value</key> 1400 <key>Value</key>
1401 <string>gth</string> 1401 <string>gth</string>
1402 </map> 1402 </map>
1403 <key>EmeraldCmdLinePos</key> 1403 <key>CmdLineChatbarPos</key>
1404 <map> 1404 <map>
1405 <key>Comment</key> 1405 <key>Comment</key>
1406 <string>Teleport to position function command</string> 1406 <string>Teleport to position function command</string>
@@ -1411,7 +1411,7 @@
1411 <key>Value</key> 1411 <key>Value</key>
1412 <string>gtp</string> 1412 <string>gtp</string>
1413 </map> 1413 </map>
1414 <key>EmeraldCmdLineGround</key> 1414 <key>CmdLineChatbarGround</key>
1415 <map> 1415 <map>
1416 <key>Comment</key> 1416 <key>Comment</key>
1417 <string>Teleport to ground function command</string> 1417 <string>Teleport to ground function command</string>
@@ -1422,7 +1422,7 @@
1422 <key>Value</key> 1422 <key>Value</key>
1423 <string>flr</string> 1423 <string>flr</string>
1424 </map> 1424 </map>
1425 <key>EmeraldCmdLineTeleportHome</key> 1425 <key>CmdLineChatbarTeleportHome</key>
1426 <map> 1426 <map>
1427 <key>Comment</key> 1427 <key>Comment</key>
1428 <string>Teleport to home function command</string> 1428 <string>Teleport to home function command</string>
@@ -1433,7 +1433,7 @@
1433 <key>Value</key> 1433 <key>Value</key>
1434 <string>tph</string> 1434 <string>tph</string>
1435 </map> 1435 </map>
1436 <key>EmeraldCmdLineRezPlatform</key> 1436 <key>CmdLineChatbarRezPlatform</key>
1437 <map> 1437 <map>
1438 <key>Comment</key> 1438 <key>Comment</key>
1439 <string>Rez a platform underneath you</string> 1439 <string>Rez a platform underneath you</string>
@@ -1444,7 +1444,7 @@
1444 <key>Value</key> 1444 <key>Value</key>
1445 <string>rezplat</string> 1445 <string>rezplat</string>
1446 </map> 1446 </map>
1447 <key>EmeraldCmdLinePlatformSize</key> 1447 <key>CmdLineChatbarPlatformSize</key>
1448 <map> 1448 <map>
1449 <key>Comment</key> 1449 <key>Comment</key>
1450 <string>How wide the rezzed platform will appear to be.</string> 1450 <string>How wide the rezzed platform will appear to be.</string>
@@ -1455,7 +1455,7 @@
1455 <key>Value</key> 1455 <key>Value</key>
1456 <real>30</real> 1456 <real>30</real>
1457 </map> 1457 </map>
1458 <key>EmeraldCmdLineMapTo</key> 1458 <key>CmdLineChatbarMapTo</key>
1459 <map> 1459 <map>
1460 <key>Comment</key> 1460 <key>Comment</key>
1461 <string>Teleport to a region by name rapidly</string> 1461 <string>Teleport to a region by name rapidly</string>
@@ -1466,7 +1466,7 @@
1466 <key>Value</key> 1466 <key>Value</key>
1467 <string>mapto</string> 1467 <string>mapto</string>
1468 </map> 1468 </map>
1469 <key>EmeraldCmdLineDrawDistance</key> 1469 <key>CmdLineChatbarDrawDistance</key>
1470 <map> 1470 <map>
1471 <key>Comment</key> 1471 <key>Comment</key>
1472 <string>Change draw distance quickly</string> 1472 <string>Change draw distance quickly</string>
@@ -1477,7 +1477,7 @@
1477 <key>Value</key> 1477 <key>Value</key>
1478 <string>dd</string> 1478 <string>dd</string>
1479 </map> 1479 </map>
1480 <key>EmeraldCmdTeleportToCam</key> 1480 <key>CmdLineChatbarTeleportToCam</key>
1481 <map> 1481 <map>
1482 <key>Comment</key> 1482 <key>Comment</key>
1483 <string>Teleport to your camera</string> 1483 <string>Teleport to your camera</string>
@@ -1488,7 +1488,7 @@
1488 <key>Value</key> 1488 <key>Value</key>
1489 <string>tp2cam</string> 1489 <string>tp2cam</string>
1490 </map> 1490 </map>
1491 <key>EmeraldCmdLineKeyToName</key> 1491 <key>CmdLineChatbarKeyToName</key>
1492 <map> 1492 <map>
1493 <key>Comment</key> 1493 <key>Comment</key>
1494 <string>Use a fast key to name querry</string> 1494 <string>Use a fast key to name querry</string>
@@ -1499,7 +1499,7 @@
1499 <key>Value</key> 1499 <key>Value</key>
1500 <string>key2name</string> 1500 <string>key2name</string>
1501 </map> 1501 </map>
1502 <key>EmeraldCmdLineOfferTp</key> 1502 <key>CmdLineChatbarOfferTp</key>
1503 <map> 1503 <map>
1504 <key>Comment</key> 1504 <key>Comment</key>
1505 <string>Offer a teleport to target avatar</string> 1505 <string>Offer a teleport to target avatar</string>
@@ -1510,7 +1510,7 @@
1510 <key>Value</key> 1510 <key>Value</key>
1511 <string>offertp</string> 1511 <string>offertp</string>
1512 </map> 1512 </map>
1513 <key>EmeraldCmdLineCalc</key> 1513 <key>CmdLineChatbarCalc</key>
1514 <map> 1514 <map>
1515 <key>Comment</key> 1515 <key>Comment</key>
1516 <string>Calculates an expression</string> 1516 <string>Calculates an expression</string>
@@ -1521,7 +1521,7 @@
1521 <key>Value</key> 1521 <key>Value</key>
1522 <string>calc</string> 1522 <string>calc</string>
1523 </map> 1523 </map>
1524 <key>EmeraldCmdLineTP2</key> 1524 <key>CmdLineChatbarTP2</key>
1525 <map> 1525 <map>
1526 <key>Comment</key> 1526 <key>Comment</key>
1527 <string>Teleport to a person by name, partials work.</string> 1527 <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 @@
50#include "llurldispatcher.h" 50#include "llurldispatcher.h"
51#include "llworld.h" 51#include "llworld.h"
52#include "llworldmap.h" 52#include "llworldmap.h"
53//KOW #include "floateravatarlist.h"
54#include "floaterao.h" 53#include "floaterao.h"
55#include "llviewerobjectlist.h" 54#include "llviewerobjectlist.h"
56#include "llviewertexteditor.h" 55#include "llviewertexteditor.h"
@@ -222,23 +221,23 @@ void invrepair()
222 gInventory.collectDescendents(gAgent.getInventoryRootID(),cats,items,FALSE);//,objectnamematches); 221 gInventory.collectDescendents(gAgent.getInventoryRootID(),cats,items,FALSE);//,objectnamematches);
223} 222}
224 223
225/*static BOOL *sEmeraldCmdLine; 224/*static BOOL *sCmdLineChatbarEnabled;
226static std::string *sEmeraldCmdLinePos; 225static std::string *sCmdLineChatbarPos;
227static std::string *sEmeraldCmdLineDrawDistance; 226static std::string *sCmdLineChatbarDrawDistance;
228static std::string *sEmeraldCmdTeleportToCam; 227static std::string *sCmdLineChatbarTeleportToCam;
229static std::string *sEmeraldCmdLineAO; 228static std::string *sCmdLineChatbarAO;
230static std::string *sEmeraldCmdLineKeyToName; 229static std::string *sCmdLineChatbarKeyToName;
231static std::string *sEmeraldCmdLineOfferTp; 230static std::string *sCmdLineChatbarOfferTp;
232static std::string *sEmeraldCmdLineGround; 231static std::string *sCmdLineChatbarGround;
233static std::string *sEmeraldCmdLineHeight; 232static std::string *sCmdLineChatbarHeight;
234static std::string *sEmeraldCmdLineTeleportHome; 233static std::string *sCmdLineChatbarTeleportHome;
235static std::string *sEmeraldCmdLineRezPlatform; 234static std::string *sCmdLineChatbarRezPlatform;
236static std::string *sEmeraldCmdLineMapTo; 235static std::string *sCmdLineChatbarMapTo;
237static BOOL *sEmeraldCmdLineMapToKeepPos; 236static BOOL *sCmdLineChatbarMapToKeepPos;
238static std::string *sEmeraldCmdLineCalc; 237static std::string *sCmdLineChatbarCalc;
239static std::string *sEmeraldCmdLineTP2; 238static std::string *sCmdLineChatbarTP2;
240static std::string *sEmeraldCmdLineClearChat; 239static std::string *sCmdLineChatbarClearChat;
241static F32 *sEmeraldCmdLinePlatformSize;*/ 240static F32 *sCmdLineChatbarPlatformSize;*/
242 241
243/* 242/*
244class another_rebind_group 243class another_rebind_group
@@ -264,36 +263,36 @@ std::map<std::string, int> get_gsaved_calls();
264 263
265bool cmd_line_chat(std::string revised_text, EChatType type) 264bool cmd_line_chat(std::string revised_text, EChatType type)
266{ 265{
267 static BOOL *sEmeraldCmdLine = rebind_llcontrol<BOOL>("EmeraldCmdLine", &gSavedSettings, true); 266 static BOOL *sCmdLineChatbarEnabled = rebind_llcontrol<BOOL>("CmdLineChatbarEnabled", &gSavedSettings, true);
268 static std::string *sEmeraldCmdLinePos = rebind_llcontrol<std::string>("EmeraldCmdLinePos", &gSavedSettings, true); 267 static std::string *sCmdLineChatbarPos = rebind_llcontrol<std::string>("CmdLineChatbarPos", &gSavedSettings, true);
269 static std::string *sEmeraldCmdLineDrawDistance = rebind_llcontrol<std::string>("EmeraldCmdLineDrawDistance", &gSavedSettings, true); 268 static std::string *sCmdLineChatbarDrawDistance = rebind_llcontrol<std::string>("CmdLineChatbarDrawDistance", &gSavedSettings, true);
270 static std::string *sEmeraldCmdTeleportToCam = rebind_llcontrol<std::string>("EmeraldCmdTeleportToCam", &gSavedSettings, true); 269 static std::string *sCmdLineChatbarTeleportToCam = rebind_llcontrol<std::string>("CmdLineChatbarTeleportToCam", &gSavedSettings, true);
271 static std::string *sEmeraldCmdLineAO = rebind_llcontrol<std::string>("EmeraldCmdLineAO", &gSavedSettings, true); 270 static std::string *sCmdLineChatbarAO = rebind_llcontrol<std::string>("CmdLineChatbarAO", &gSavedSettings, true);
272 static std::string *sEmeraldCmdLineKeyToName = rebind_llcontrol<std::string>("EmeraldCmdLineKeyToName", &gSavedSettings, true); 271 static std::string *sCmdLineChatbarKeyToName = rebind_llcontrol<std::string>("CmdLineChatbarKeyToName", &gSavedSettings, true);
273 static std::string *sEmeraldCmdLineOfferTp = rebind_llcontrol<std::string>("EmeraldCmdLineOfferTp", &gSavedSettings, true); 272 static std::string *sCmdLineChatbarOfferTp = rebind_llcontrol<std::string>("CmdLineChatbarOfferTp", &gSavedSettings, true);
274 static std::string *sEmeraldCmdLineGround = rebind_llcontrol<std::string>("EmeraldCmdLineGround", &gSavedSettings, true); 273 static std::string *sCmdLineChatbarGround = rebind_llcontrol<std::string>("CmdLineChatbarGround", &gSavedSettings, true);
275 static std::string *sEmeraldCmdLineHeight = rebind_llcontrol<std::string>("EmeraldCmdLineHeight", &gSavedSettings, true); 274 static std::string *sCmdLineChatbarHeight = rebind_llcontrol<std::string>("CmdLineChatbarHeight", &gSavedSettings, true);
276 static std::string *sEmeraldCmdLineTeleportHome = rebind_llcontrol<std::string>("EmeraldCmdLineTeleportHome", &gSavedSettings, true); 275 static std::string *sCmdLineChatbarTeleportHome = rebind_llcontrol<std::string>("CmdLineChatbarTeleportHome", &gSavedSettings, true);
277 static std::string *sEmeraldCmdLineRezPlatform = rebind_llcontrol<std::string>("EmeraldCmdLineRezPlatform", &gSavedSettings, true); 276 static std::string *sCmdLineChatbarRezPlatform = rebind_llcontrol<std::string>("CmdLineChatbarRezPlatform", &gSavedSettings, true);
278 static std::string *sEmeraldCmdLineMapTo = rebind_llcontrol<std::string>("EmeraldCmdLineMapTo", &gSavedSettings, true); 277 static std::string *sCmdLineChatbarMapTo = rebind_llcontrol<std::string>("CmdLineChatbarMapTo", &gSavedSettings, true);
279 static BOOL *sEmeraldCmdLineMapToKeepPos = rebind_llcontrol<BOOL>("EmeraldCmdLineMapToKeepPos", &gSavedSettings, true); 278 static BOOL *sCmdLineChatbarMapToKeepPos = rebind_llcontrol<BOOL>("CmdLineChatbarMapToKeepPos", &gSavedSettings, true);
280 static std::string *sEmeraldCmdLineCalc = rebind_llcontrol<std::string>("EmeraldCmdLineCalc", &gSavedSettings, true); 279 static std::string *sCmdLineChatbarCalc = rebind_llcontrol<std::string>("CmdLineChatbarCalc", &gSavedSettings, true);
281 static std::string *sEmeraldCmdLineTP2 = rebind_llcontrol<std::string>("EmeraldCmdLineTP2", &gSavedSettings, true); 280 static std::string *sCmdLineChatbarTP2 = rebind_llcontrol<std::string>("CmdLineChatbarTP2", &gSavedSettings, true);
282 static std::string *sEmeraldCmdLineClearChat = rebind_llcontrol<std::string>("EmeraldCmdLineClearChat", &gSavedSettings, true); 281 static std::string *sCmdLineChatbarClearChat = rebind_llcontrol<std::string>("CmdLineChatbarClearChat", &gSavedSettings, true);
283 static std::string *sEmeraldCmdLineMedia = rebind_llcontrol<std::string>("EmeraldCmdLineMedia", &gSavedSettings, true); 282 static std::string *sCmdLineChatbarMedia = rebind_llcontrol<std::string>("CmdLineChatbarMedia", &gSavedSettings, true);
284 static std::string *sEmeraldCmdLineMusic = rebind_llcontrol<std::string>("EmeraldCmdLineMusic", &gSavedSettings, true); 283 static std::string *sCmdLineChatbarMusic = rebind_llcontrol<std::string>("CmdLineChatbarMusic", &gSavedSettings, true);
285 static std::string *sEmeraldCmdLineAutocorrect = rebind_llcontrol<std::string>("EmeraldCmdLineAutocorrect", &gSavedSettings, true); 284 static std::string *sCmdLineChatbarAutocorrect = rebind_llcontrol<std::string>("CmdLineChatbarAutocorrect", &gSavedSettings, true);
286 //static std::string *sEmeraldCmdUndeform = rebind_llcontrol<std::string>("EmeraldCmdUndeform", &gSavedSettings, true); 285 //static std::string *sCmdLineChatbarUndeform = rebind_llcontrol<std::string>("CmdLineChatbarUndeform", &gSavedSettings, true);
287 //gSavedSettings.getString("EmeraldCmdUndeform") 286 //gSavedSettings.getString("CmdLineChatbarUndeform")
288 287
289 if(*sEmeraldCmdLine) 288 if(*sCmdLineChatbarEnabled)
290 { 289 {
291 std::istringstream i(revised_text); 290 std::istringstream i(revised_text);
292 std::string command; 291 std::string command;
293 i >> command; 292 i >> command;
294 if(command != "") 293 if(command != "")
295 { 294 {
296 if(command == *sEmeraldCmdLinePos) 295 if(command == *sCmdLineChatbarPos)
297 { 296 {
298 F32 x,y,z; 297 F32 x,y,z;
299 if (i >> x) 298 if (i >> x)
@@ -316,7 +315,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
316 } 315 }
317 } 316 }
318 } 317 }
319 else if(command == *sEmeraldCmdLineDrawDistance) 318 else if(command == *sCmdLineChatbarDrawDistance)
320 { 319 {
321 int drawDist; 320 int drawDist;
322 if(i >> drawDist) 321 if(i >> drawDist)
@@ -329,18 +328,18 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
329 return false; 328 return false;
330 } 329 }
331 } 330 }
332 else if(command == *sEmeraldCmdTeleportToCam) 331 else if(command == *sCmdLineChatbarTeleportToCam)
333 { 332 {
334 gAgent.teleportViaLocation(gAgent.getCameraPositionGlobal()); 333 gAgent.teleportViaLocation(gAgent.getCameraPositionGlobal());
335 return false; 334 return false;
336 } 335 }
337 /*else if(command == *sEmeraldCmdUndeform) 336 /*else if(command == *sCmdLineChatbarUndeform)
338 { 337 {
339 llinfos << "UNDEFORM: Do you feel your bones cracking back into place?" << llendl; 338 llinfos << "UNDEFORM: Do you feel your bones cracking back into place?" << llendl;
340 gAgent.getAvatarObject()->undeform(); 339 gAgent.getAvatarObject()->undeform();
341 return false; 340 return false;
342 }*/ //what the fuck is this shit, thought it would be something useful like repairing the skeleton but its some shitty playing of inworld anims 341 }*/ //what the fuck is this shit, thought it would be something useful like repairing the skeleton but its some shitty playing of inworld anims
343 else if(command == *sEmeraldCmdLineMedia) 342 else if(command == *sCmdLineChatbarMedia)
344 { 343 {
345 std::string url; 344 std::string url;
346 std::string type; 345 std::string type;
@@ -358,7 +357,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
358 } 357 }
359 } 358 }
360 } 359 }
361 else if(command == *sEmeraldCmdLineMusic) 360 else if(command == *sCmdLineChatbarMusic)
362 { 361 {
363 std::string status; 362 std::string status;
364 if(i >> status) 363 if(i >> status)
@@ -371,7 +370,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
371 return false; 370 return false;
372 } 371 }
373 } 372 }
374 else if(command == *sEmeraldCmdLineAO) 373 else if(command == *sCmdLineChatbarAO)
375 { 374 {
376 std::string status; 375 std::string status;
377 if(i >> status) 376 if(i >> status)
@@ -394,7 +393,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
394 } 393 }
395 return false; 394 return false;
396 } 395 }
397 else if(command == *sEmeraldCmdLineKeyToName) 396 else if(command == *sCmdLineChatbarKeyToName)
398 { 397 {
399 LLUUID targetKey; 398 LLUUID targetKey;
400 if(i >> targetKey) 399 if(i >> targetKey)
@@ -496,7 +495,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
496 cmdline_printchat(std::string("Standing up")); 495 cmdline_printchat(std::string("Standing up"));
497 return false; 496 return false;
498 } 497 }
499 else if(command == *sEmeraldCmdLineOfferTp) 498 else if(command == *sCmdLineChatbarOfferTp)
500 { 499 {
501 std::string avatarKey; 500 std::string avatarKey;
502// llinfos << "CMD DEBUG 0 " << command << " " << avatarName << llendl; 501// llinfos << "CMD DEBUG 0 " << command << " " << avatarName << llendl;
@@ -532,7 +531,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
532 } 531 }
533 } 532 }
534 533
535 else if(command == *sEmeraldCmdLineGround) 534 else if(command == *sCmdLineChatbarGround)
536 { 535 {
537 LLVector3 agentPos = gAgent.getPositionAgent(); 536 LLVector3 agentPos = gAgent.getPositionAgent();
538 U64 agentRegion = gAgent.getRegion()->getHandle(); 537 U64 agentRegion = gAgent.getRegion()->getHandle();
@@ -541,7 +540,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
541 pos_global += LLVector3d((F64)targetPos.mV[0],(F64)targetPos.mV[1],(F64)targetPos.mV[2]); 540 pos_global += LLVector3d((F64)targetPos.mV[0],(F64)targetPos.mV[1],(F64)targetPos.mV[2]);
542 gAgent.teleportViaLocation(pos_global); 541 gAgent.teleportViaLocation(pos_global);
543 return false; 542 return false;
544 }else if(command == *sEmeraldCmdLineHeight) 543 }else if(command == *sCmdLineChatbarHeight)
545 { 544 {
546 F32 z; 545 F32 z;
547 if(i >> z) 546 if(i >> z)
@@ -554,17 +553,17 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
554 gAgent.teleportViaLocation(pos_global); 553 gAgent.teleportViaLocation(pos_global);
555 return false; 554 return false;
556 } 555 }
557 }else if(command == *sEmeraldCmdLineTeleportHome) 556 }else if(command == *sCmdLineChatbarTeleportHome)
558 { 557 {
559 gAgent.teleportHome(); 558 gAgent.teleportHome();
560 return false; 559 return false;
561 }else if(command == *sEmeraldCmdLineRezPlatform) 560 }else if(command == *sCmdLineChatbarRezPlatform)
562 { 561 {
563 F32 width; 562 F32 width;
564 if (i >> width) cmdline_rezplat(false, width); 563 if (i >> width) cmdline_rezplat(false, width);
565 else cmdline_rezplat(); 564 else cmdline_rezplat();
566 return false; 565 return false;
567 }else if(command == *sEmeraldCmdLineMapTo) 566 }else if(command == *sCmdLineChatbarMapTo)
568 { 567 {
569 if (revised_text.length() > command.length() + 1) //Typing this command with no argument was causing a crash. -Madgeek 568 if (revised_text.length() > command.length() + 1) //Typing this command with no argument was causing a crash. -Madgeek
570 { 569 {
@@ -575,7 +574,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
575 std::string region_name = LLWeb::escapeURL(revised_text.substr(command.length()+1)); 574 std::string region_name = LLWeb::escapeURL(revised_text.substr(command.length()+1));
576 std::string url; 575 std::string url;
577 576
578 if(!*sEmeraldCmdLineMapToKeepPos) 577 if(!*sCmdLineChatbarMapToKeepPos)
579 { 578 {
580 agent_x = 128; 579 agent_x = 128;
581 agent_y = 128; 580 agent_y = 128;
@@ -586,7 +585,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
586 LLURLDispatcher::dispatch(url, NULL, true); 585 LLURLDispatcher::dispatch(url, NULL, true);
587 } 586 }
588 return false; 587 return false;
589 }else if(command == *sEmeraldCmdLineCalc)//Cryogenic Blitz 588 }else if(command == *sCmdLineChatbarCalc)//Cryogenic Blitz
590 { 589 {
591 bool success; 590 bool success;
592 F32 result = 0.f; 591 F32 result = 0.f;
@@ -615,7 +614,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
615 cmdline_printchat(out); 614 cmdline_printchat(out);
616 return false; 615 return false;
617 } 616 }
618 }else if(command == *sEmeraldCmdLineTP2) 617 }else if(command == *sCmdLineChatbarTP2)
619 { 618 {
620 if (revised_text.length() > command.length() + 1) //Typing this command with no argument was causing a crash. -Madgeek 619 if (revised_text.length() > command.length() + 1) //Typing this command with no argument was causing a crash. -Madgeek
621 { 620 {
@@ -630,22 +629,22 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
630 cmdline_printchat("Displaying AutoCorrection Floater."); 629 cmdline_printchat("Displaying AutoCorrection Floater.");
631 return false; 630 return false;
632 } 631 }
633 else if(command == *sEmeraldCmdLineAutocorrect) 632 else if(command == *sCmdLineChatbarAutocorrect)
634 { 633 {
635 if (revised_text.length() <= command.length() + 1) //KOW: verify that we have params 634 if (revised_text.length() <= command.length() + 1) //KOW: verify that we have params
636 { 635 {
637 cmdline_printchat("No parameter specified, correct usage is "+ 636 cmdline_printchat("No parameter specified, correct usage is "+
638 *sEmeraldCmdLineAutocorrect+" list Name|wrong word|right word."); 637 *sCmdLineChatbarAutocorrect+" list Name|wrong word|right word.");
639 return false; 638 return false;
640 } 639 }
641 640
642 std::string info = revised_text.substr((*sEmeraldCmdLineAutocorrect).length()+1); 641 std::string info = revised_text.substr((*sCmdLineChatbarAutocorrect).length()+1);
643 //addac list name|wrong word|right word 642 //addac list name|wrong word|right word
644 int bar = info.find("|"); 643 int bar = info.find("|");
645 if (bar==std::string::npos) 644 if (bar==std::string::npos)
646 { 645 {
647 cmdline_printchat("Wrong usage, correct usage is "+ 646 cmdline_printchat("Wrong usage, correct usage is "+
648 *sEmeraldCmdLineAutocorrect+" list name|wrong word|right word."); 647 *sCmdLineChatbarAutocorrect+" list name|wrong word|right word.");
649 return false; 648 return false;
650 } 649 }
651 650
@@ -657,7 +656,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
657 if (bar==std::string::npos) 656 if (bar==std::string::npos)
658 { 657 {
659 cmdline_printchat("Wrong usage, correct usage is"+ 658 cmdline_printchat("Wrong usage, correct usage is"+
660 *sEmeraldCmdLineAutocorrect+" list name|wrong word|right word."); 659 *sCmdLineChatbarAutocorrect+" list name|wrong word|right word.");
661 return false; 660 return false;
662 } 661 }
663 662
@@ -683,7 +682,7 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
683// //gAgent.getAvatarObject()->loadAvatar(); 682// //gAgent.getAvatarObject()->loadAvatar();
684// return false; 683// return false;
685// } 684// }
686 else if(command == *sEmeraldCmdLineClearChat) 685 else if(command == *sCmdLineChatbarClearChat)
687 { 686 {
688 LLFloaterChat* chat = LLFloaterChat::getInstance(LLSD()); 687 LLFloaterChat* chat = LLFloaterChat::getInstance(LLSD());
689 if(chat) 688 if(chat)
@@ -930,9 +929,9 @@ void cmdline_rezplat(bool use_saved_value, F32 visual_radius) //cmdline_rezplat(
930 LLQuaternion rotation; 929 LLQuaternion rotation;
931 rotation.setQuat(90.f * DEG_TO_RAD, LLVector3::y_axis); 930 rotation.setQuat(90.f * DEG_TO_RAD, LLVector3::y_axis);
932 931
933 static F32 *sEmeraldCmdLinePlatformSize = rebind_llcontrol<F32>("EmeraldCmdLinePlatformSize", &gSavedSettings, true); 932 static F32 *sCmdLineChatbarPlatformSize = rebind_llcontrol<F32>("CmdLineChatbarPlatformSize", &gSavedSettings, true);
934 933
935 if (use_saved_value) visual_radius = *sEmeraldCmdLinePlatformSize; 934 if (use_saved_value) visual_radius = *sCmdLineChatbarPlatformSize;
936 F32 realsize = visual_radius / 3.0f; 935 F32 realsize = visual_radius / 3.0f;
937 if (realsize < 0.01f) realsize = 0.01f; 936 if (realsize < 0.01f) realsize = 0.01f;
938 else if (realsize > 10.0f) realsize = 10.0f; 937 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 @@
1/**
2* @file floatercommandline.cpp
3* @brief change chatbar as a commandline preferences in Imprudence
4*
5* $LicenseInfo:firstyear=2009&license=viewergpl$
6*
7* Copyright (c) 2010, McCabe Maxsted
8*
9* Imprudence Viewer Source Code
10* The source code in this file ("Source Code") is provided to you
11* under the terms of the GNU General Public License, version 2.0
12* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
13* this distribution, or online at
14* http://secondlifegrid.net/programs/open_source/licensing/gplv2
15*
16* There are special exceptions to the terms and conditions of the GPL as
17* it is applied to this Source Code. View the full text of the exception
18* in the file doc/FLOSS-exception.txt in this software distribution, or
19* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
20*
21* By copying, modifying or distributing this software, you acknowledge
22* that you have read and understood your obligations described above,
23* and agree to abide by those obligations.
24*
25* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
26* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27* COMPLETENESS OR PERFORMANCE.
28* $/LicenseInfo$
29*/
30
31#include "llviewerprecompiledheaders.h"
32
33#include "floatercommandline.h"
34
35#include "lluictrlfactory.h"
36#include "llviewercontrol.h"
37
38FloaterCommandLine::FloaterCommandLine(const LLSD& seed) : LLFloater("floater_command_line")
39{
40 LLUICtrlFactory::getInstance()->buildFloater(this, "floater_command_line.xml");
41}
42
43FloaterCommandLine::~FloaterCommandLine()
44{
45}
46
47BOOL FloaterCommandLine::postBuild()
48{
49 childSetAction("Help_CmdLine", onClickHelp, this);
50
51 childSetCommitCallback("CmdLineChatbarPos", onCommitApplyControl);
52 childSetCommitCallback("CmdLineChatbarGround", onCommitApplyControl);
53 childSetCommitCallback("CmdLineChatbarHeight", onCommitApplyControl);
54 childSetCommitCallback("CmdLineChatbarTeleportHome", onCommitApplyControl);
55 childSetCommitCallback("CmdLineChatbarRezPlatform", onCommitApplyControl);
56 childSetCommitCallback("CmdLineChatbarMapTo", onCommitApplyControl);
57 childSetCommitCallback("CmdLineChatbarCalc", onCommitApplyControl);
58
59 childSetCommitCallback("CmdLineChatbarDrawDistance", onCommitApplyControl);
60 childSetCommitCallback("CmdLineChatbarTeleportToCam", onCommitApplyControl);
61 childSetCommitCallback("CmdLineChatbarKeyToName", onCommitApplyControl);
62 childSetCommitCallback("CmdLineChatbarOfferTp", onCommitApplyControl);
63 childSetCommitCallback("CmdLineChatbarTP2", onCommitApplyControl);
64 childSetCommitCallback("CmdLineChatbarAO", onCommitApplyControl);
65 childSetCommitCallback("CmdLineChatbarClearChat", onCommitApplyControl);
66
67 return TRUE;
68}
69
70//workaround for lineeditor dumbness in regards to control_name
71void FloaterCommandLine::onCommitApplyControl(LLUICtrl* caller, void* user_data)
72{
73 LLLineEditor* line = (LLLineEditor*)caller;
74 if(line)
75 {
76 LLControlVariable *var = line->findControl(line->getControlName());
77 if(var)var->setValue(line->getValue());
78 }
79}
80
81void FloaterCommandLine::onClickHelp(void* data)
82{
83 LLNotifications::instance().add("Help_CmdLine");
84}
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 @@
1/**
2* @file floatercommandline.h
3* @brief change chatbar as a commandline preferences in Imprudence
4*
5* $LicenseInfo:firstyear=2009&license=viewergpl$
6*
7* Copyright (c) 2010, McCabe Maxsted
8*
9* Imprudence Viewer Source Code
10* The source code in this file ("Source Code") is provided to you
11* under the terms of the GNU General Public License, version 2.0
12* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
13* this distribution, or online at
14* http://secondlifegrid.net/programs/open_source/licensing/gplv2
15*
16* There are special exceptions to the terms and conditions of the GPL as
17* it is applied to this Source Code. View the full text of the exception
18* in the file doc/FLOSS-exception.txt in this software distribution, or
19* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
20*
21* By copying, modifying or distributing this software, you acknowledge
22* that you have read and understood your obligations described above,
23* and agree to abide by those obligations.
24*
25* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
26* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27* COMPLETENESS OR PERFORMANCE.
28* $/LicenseInfo$
29*/
30
31#ifndef FLOATERCOMMANDLINE_H
32#define FLOATERCOMMANDLINE_H
33
34#include "llfloater.h"
35
36class FloaterCommandLine : public LLFloater, public LLFloaterSingleton<FloaterCommandLine>
37{
38public:
39 FloaterCommandLine(const LLSD& seed);
40 virtual ~FloaterCommandLine();
41
42 BOOL postBuild();
43
44 //void apply();
45 //void cancel();
46
47private:
48 //static void onClickOK(void* userdata);
49 //static void onClickCancel(void* userdata);
50 static void onCommitApplyControl(LLUICtrl* caller, void* user_data);
51
52 static void onClickHelp(void* data);
53};
54
55#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 @@
49#include "llcheckboxctrl.h" 49#include "llcheckboxctrl.h"
50#include "llviewercontrol.h" 50#include "llviewercontrol.h"
51 51
52#include "floaterbusy.h" // InvDropTarget
52#include "llui.h" 53#include "llui.h"
53#include "llcontrol.h" 54#include "llcontrol.h"
54#include "llscrolllistctrl.h" 55#include "llscrolllistctrl.h"
@@ -89,7 +90,7 @@ public:
89 LLPrefsAdvanced * empanel; 90 LLPrefsAdvanced * empanel;
90private: 91private:
91 static lggAutoCorrectFloater* sInstance; 92 static lggAutoCorrectFloater* sInstance;
92 static JCInvDropTarget* mNotecardDropTarget; 93 static InvDropTarget* mNotecardDropTarget;
93 static void onBoxCommitEnabled(LLUICtrl* caller, void* user_data); 94 static void onBoxCommitEnabled(LLUICtrl* caller, void* user_data);
94 static void onEntrySettingChange(LLUICtrl* caller, void* user_data); 95 static void onEntrySettingChange(LLUICtrl* caller, void* user_data);
95 static void onSelectName(LLUICtrl* caller, void* user_data); 96 static void onSelectName(LLUICtrl* caller, void* user_data);
@@ -107,7 +108,7 @@ private:
107 108
108 109
109 110
110JCInvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget; 111InvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget;
111lggAutoCorrectFloater* lggAutoCorrectFloater::sInstance; 112lggAutoCorrectFloater* lggAutoCorrectFloater::sInstance;
112 113
113lggAutoCorrectFloater::~lggAutoCorrectFloater() 114lggAutoCorrectFloater::~lggAutoCorrectFloater()
@@ -165,7 +166,7 @@ BOOL lggAutoCorrectFloater::postBuild(void)
165 { 166 {
166 delete mNotecardDropTarget; 167 delete mNotecardDropTarget;
167 } 168 }
168 mNotecardDropTarget = new JCInvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID); 169 mNotecardDropTarget = new InvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID);
169 addChild(mNotecardDropTarget); 170 addChild(mNotecardDropTarget);
170 } 171 }
171 return true; 172 return true;
@@ -429,7 +430,7 @@ void lggAutoCorrectFloater::addEntry(void* data)
429{ 430{
430 std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString(); 431 std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
431 LLChat chat; 432 LLChat chat;
432 chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("EmeraldCmdLineAutocorrect")+" "+listName+"|wrongWord|rightWord\""; 433 chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("CmdLineChatbarAutocorrect")+" "+listName+"|wrongWord|rightWord\"";
433 chat.mSourceType = CHAT_SOURCE_SYSTEM; 434 chat.mSourceType = CHAT_SOURCE_SYSTEM;
434 LLFloaterChat::addChat(chat, FALSE, FALSE); 435 LLFloaterChat::addChat(chat, FALSE, FALSE);
435} 436}
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 @@
32 32
33#include "llcombobox.h" 33#include "llcombobox.h"
34 34
35#include "floatercommandline.h"
35#include "llagent.h" 36#include "llagent.h"
36#include "llprefsadvanced.h" 37#include "llprefsadvanced.h"
37#include "llviewercontrol.h" 38#include "llviewercontrol.h"
@@ -43,76 +44,6 @@
43 44
44#include "lluictrlfactory.h" 45#include "lluictrlfactory.h"
45 46
46////////begin drop utility/////////////
47//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
48// Class JCInvDropTarget
49//
50// This handy class is a simple way to drop something on another
51// view. It handles drop events, always setting itself to the size of
52// its parent.
53//
54// altered to support a callback so i can slap it in things and it just return the item to a func of my choice
55//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
56
57
58
59
60JCInvDropTarget::JCInvDropTarget(const std::string& name, const LLRect& rect,
61 void (*callback)(LLViewerInventoryItem*)) :
62LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
63mDownCallback(callback)
64{
65}
66
67JCInvDropTarget::~JCInvDropTarget()
68{
69}
70
71void JCInvDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
72{
73 llinfos << "JCInvDropTarget::doDrop()" << llendl;
74}
75
76BOOL JCInvDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
77 EDragAndDropType cargo_type,
78 void* cargo_data,
79 EAcceptance* accept,
80 std::string& tooltip_msg)
81{
82 BOOL handled = FALSE;
83 if(getParent())
84 {
85 handled = TRUE;
86 // check the type
87 //switch(cargo_type)
88 //{
89 //case DAD_ANIMATION:
90 //{
91 LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
92 if(gInventory.getItem(inv_item->getUUID()))
93 {
94 *accept = ACCEPT_YES_COPY_SINGLE;
95 if(drop)
96 {
97 //printchat("accepted");
98 mDownCallback(inv_item);
99 }
100 }
101 else
102 {
103 *accept = ACCEPT_NO;
104 }
105 // break;
106 //}
107 //default:
108 // *accept = ACCEPT_NO;
109 // break;
110 //}
111 }
112 return handled;
113}
114////////end drop utility///////////////
115
116LLPrefsAdvanced* LLPrefsAdvanced::sInstance; 47LLPrefsAdvanced* LLPrefsAdvanced::sInstance;
117 48
118LLPrefsAdvanced::LLPrefsAdvanced() 49LLPrefsAdvanced::LLPrefsAdvanced()
@@ -124,6 +55,7 @@ LLPrefsAdvanced::LLPrefsAdvanced()
124 childSetCommitCallback("speed_rez_check", onCommitCheckBox, this); 55 childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
125 56
126 childSetAction("reset_btn", onClickResetPrefs, this); 57 childSetAction("reset_btn", onClickResetPrefs, this);
58 childSetAction("command_line_btn", onClickCommandLine, this);
127} 59}
128 60
129LLPrefsAdvanced::~LLPrefsAdvanced() 61LLPrefsAdvanced::~LLPrefsAdvanced()
@@ -160,6 +92,7 @@ BOOL LLPrefsAdvanced::postBuild()
160 childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose")); 92 childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose"));
161 childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC")); 93 childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC"));
162 childSetValue("shadows_check", gSavedSettings.getBOOL("ShadowsEnabled")); 94 childSetValue("shadows_check", gSavedSettings.getBOOL("ShadowsEnabled"));
95 childSetValue("command_line_check", gSavedSettings.getBOOL("CmdLineChatbarEnabled"));
163 96
164 childSetValue("lightshare_combo", 97 childSetValue("lightshare_combo",
165 LLSD((S32)gSavedSettings.getU32("LightShareAllowed"))); 98 LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
@@ -167,22 +100,6 @@ BOOL LLPrefsAdvanced::postBuild()
167 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox"); 100 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
168 crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING)); 101 crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
169 102
170 childSetCommitCallback("EmeraldCmdLinePos", onCommitApplyControl);
171 childSetCommitCallback("EmeraldCmdLineGround", onCommitApplyControl);
172 childSetCommitCallback("EmeraldCmdLineHeight", onCommitApplyControl);
173 childSetCommitCallback("EmeraldCmdLineTeleportHome", onCommitApplyControl);
174 childSetCommitCallback("EmeraldCmdLineRezPlatform", onCommitApplyControl);
175 childSetCommitCallback("EmeraldCmdLineMapTo", onCommitApplyControl);
176 childSetCommitCallback("EmeraldCmdLineCalc", onCommitApplyControl);
177
178 childSetCommitCallback("EmeraldCmdLineDrawDistance", onCommitApplyControl);
179 childSetCommitCallback("EmeraldCmdTeleportToCam", onCommitApplyControl);
180 childSetCommitCallback("EmeraldCmdLineKeyToName", onCommitApplyControl);
181 childSetCommitCallback("EmeraldCmdLineOfferTp", onCommitApplyControl);
182 childSetCommitCallback("EmeraldCmdLineTP2", onCommitApplyControl);
183 childSetCommitCallback("EmeraldCmdLineAO", onCommitApplyControl);
184 childSetCommitCallback("EmeraldCmdLineClearChat", onCommitApplyControl);
185
186 getChild<LLComboBox>("EmeraldSpellBase")->setCommitCallback(onSpellBaseComboBoxCommit); 103 getChild<LLComboBox>("EmeraldSpellBase")->setCommitCallback(onSpellBaseComboBoxCommit);
187 getChild<LLButton>("EmSpell_EditCustom")->setClickedCallback(onSpellEditCustom, this); 104 getChild<LLButton>("EmSpell_EditCustom")->setClickedCallback(onSpellEditCustom, this);
188 getChild<LLButton>("EmSpell_GetMore")->setClickedCallback(onSpellGetMore, this); 105 getChild<LLButton>("EmSpell_GetMore")->setClickedCallback(onSpellGetMore, this);
@@ -191,7 +108,6 @@ BOOL LLPrefsAdvanced::postBuild()
191 108
192 getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton,this); 109 getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton,this);
193 110
194 initHelpBtn("EmeraldHelp_CmdLine", "EmeraldHelp_CmdLine");
195 initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck"); 111 initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck");
196 112
197 refresh(); 113 refresh();
@@ -277,6 +193,8 @@ void LLPrefsAdvanced::apply()
277 build_pie_menus(); 193 build_pie_menus();
278 } 194 }
279 195
196 gSavedSettings.setBOOL("CmdLineChatbarEnabled", childGetValue("command_line_check").asBoolean());
197
280 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox"); 198 LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
281 gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex()); 199 gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
282} 200}
@@ -362,17 +280,6 @@ bool LLPrefsAdvanced::callbackReset(const LLSD& notification, const LLSD& respon
362 return false; 280 return false;
363} 281}
364 282
365//workaround for lineeditor dumbness in regards to control_name
366void LLPrefsAdvanced::onCommitApplyControl(LLUICtrl* caller, void* user_data)
367{
368 LLLineEditor* line = (LLLineEditor*)caller;
369 if(line)
370 {
371 LLControlVariable *var = line->findControl(line->getControlName());
372 if(var)var->setValue(line->getValue());
373 }
374}
375
376void LLPrefsAdvanced::onSpellAdd(void* data) 283void LLPrefsAdvanced::onSpellAdd(void* data)
377{ 284{
378 LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data; 285 LLPrefsAdvanced* panel = (LLPrefsAdvanced*)data;
@@ -416,4 +323,10 @@ void LLPrefsAdvanced::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
416void LLPrefsAdvanced::onAutoCorrectButton(void * data) 323void LLPrefsAdvanced::onAutoCorrectButton(void * data)
417{ 324{
418 lggAutoCorrectFloaterStart::show(TRUE,data); 325 lggAutoCorrectFloaterStart::show(TRUE,data);
419} \ No newline at end of file 326}
327
328void LLPrefsAdvanced::onClickCommandLine(void* data)
329{
330 FloaterCommandLine::getInstance()->open();
331 FloaterCommandLine::getInstance()->center();
332}
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 @@
34#include "llpanel.h" 34#include "llpanel.h"
35#include "llviewerinventory.h" 35#include "llviewerinventory.h"
36 36
37class JCInvDropTarget : public LLView
38{
39public:
40 JCInvDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*));
41 ~JCInvDropTarget();
42
43 void doDrop(EDragAndDropType cargo_type, void* cargo_data);
44
45 //
46 // LLView functionality
47 virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
48 EDragAndDropType cargo_type,
49 void* cargo_data,
50 EAcceptance* accept,
51 std::string& tooltip_msg);
52protected:
53 void (*mDownCallback)(LLViewerInventoryItem*);
54};
55
56class LLPrefsAdvanced : public LLPanel 37class LLPrefsAdvanced : public LLPanel
57{ 38{
58public: 39public:
@@ -70,11 +51,10 @@ private:
70 51
71 static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); 52 static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
72 static void onClickResetPrefs(void* user_data); 53 static void onClickResetPrefs(void* user_data);
54 static void onClickCommandLine(void* data);
73 55
74 static bool callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self); 56 static bool callbackReset(const LLSD& notification, const LLSD& response, LLPrefsAdvanced *self);
75 57
76 static void onCommitApplyControl(LLUICtrl* caller, void* user_data);
77
78 static void onSpellAdd(void* data); 58 static void onSpellAdd(void* data);
79 static void onSpellRemove(void* data); 59 static void onSpellRemove(void* data);
80 static void onSpellGetMore(void* data); 60 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 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="busy" title="Chatbar Commands"
3 height="400" width="500"
4 follows="top|right" can_close="true" can_drag_on_left="false"
5 can_minimize="true" can_resize="false" can_tear_off="false">
6 <text bottom="-55" follows="left|top" font="SansSerifSmall" height="16" left="15"
7 name="loltxt2" width="512"> Teleport within sim (usage: cmd x y z)</text>
8 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
9 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
10 tool_tip="" name="CmdLineChatbarPos" control_name="CmdLineChatbarPos" width="200"/>
11 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
12 name="loltxt3" width="512"> Teleport to ground (usage: cmd)</text>
13 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
14 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
15 tool_tip="" name="CmdLineChatbarGround" control_name="CmdLineChatbarGround" width="200"/>
16 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
17 name="loltxt4" width="512"> Teleport to altitude (usage: cmd z)</text>
18 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
19 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
20 tool_tip="" name="CmdLineChatbarHeight" control_name="CmdLineChatbarHeight" width="200"/>
21 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
22 name="loltxt5" width="512"> Teleport home (usage: cmd)</text>
23 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
24 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
25 tool_tip="" name="CmdLineChatbarTeleportHome" control_name="CmdLineChatbarTeleportHome"
26 width="200"/>
27 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
28 name="loltxt6" width="512"> Rez a platform (usage: cmd 0 - 30)</text>
29 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
30 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
31 tool_tip="" name="CmdLineChatbarRezPlatform" control_name="CmdLineChatbarRezPlatform"
32 width="200"/>
33 <slider bottom_delta="-20" left="20" name="CmdLineChatbarPlatformSize" control_name="CmdLineChatbarPlatformSize"
34 decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
35 initial_val="5" label="Width" label_width="30" max_val="30" min_val="5"
36 mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
37 <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left="15"
38 name="loltxt7" width="512"> Teleport to sim x (usage: cmd simname)</text>
39 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
40 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
41 tool_tip="" name="CmdLineChatbarMapTo" control_name="CmdLineChatbarMapTo" width="200"/>
42 <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
43 initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
44 name="toggle" radio_style="false" width="270" control_name="CmdLineChatbarMapToKeepPos"/>
45 <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
46 name="loltxt8" width="512"> Calc. expressions (usage: cmd SIN(2+2))</text>
47 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
48 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
49 tool_tip="" name="CmdLineChatbarCalc" control_name="CmdLineChatbarCalc" width="200"/>
50 <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
51 width="512">Add autocorrect word(cmd list|bad|good)</text>
52 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
53 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
54 tool_tip="" name="CmdLineChatbarAutocorrect" control_name="CmdLineChatbarAutocorrect" width="200"/>
55
56 <text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="230"
57 name="loltxt9" width="512"> Change Draw Distance (usage: cmd meters)</text>
58 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
59 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
60 tool_tip="" name="CmdLineChatbarDrawDistance" control_name="CmdLineChatbarDrawDistance"
61 width="200"/>
62 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
63 name="loltxt10" width="512"> Teleport to cam position (usage: cmd)</text>
64 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
65 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
66 tool_tip="" name="CmdLineChatbarTeleportToCam" control_name="CmdLineChatbarTeleportToCam"
67 width="200"/>
68 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
69 name="loltxt11" width="512"> Get avatar name from key (usage: cmd key)</text>
70 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
71 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
72 tool_tip="" name="CmdLineChatbarKeyToName" control_name="CmdLineChatbarKeyToName"
73 width="200"/>
74 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
75 name="loltxt12" width="512"> Offer teleport to avatar (usage: cmd key)</text>
76 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
77 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
78 tool_tip="" name="CmdLineChatbarOfferTp" control_name="CmdLineChatbarOfferTp" width="200"/>
79 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
80 name="loltxt13" width="512"> Teleport to avatar (usage: cmd name)</text>
81 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
82 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
83 tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
84 name="CmdLineChatbarTP2" control_name="CmdLineChatbarTP2" width="200"/>
85 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
86 name="loltxt14" width="512"> Turn AO on/off (usage: cmd on/off)</text>
87 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
88 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
89 tool_tip="" name="CmdLineChatbarAO" control_name="CmdLineChatbarAO" width="200"/>
90 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
91 name="loltxt15" width="512"> Clear the chat history (usage: cmd)</text>
92 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
93 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
94 tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="CmdLineChatbarClearChat" control_name="CmdLineChatbarClearChat" width="200"/>
95 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
96 name="loltxt15" width="512"> Set the media url (usage: cmd url type)</text>
97 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
98 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
99 tool_tip="Sets and plays your media stream to the entered url" name="CmdLineChatbarMedia" control_name="CmdLineChatbarMedia" width="200"/>
100 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
101 name="loltxt15" width="512"> Set the music stream url (usage: cmd url)</text>
102 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
103 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
104 tool_tip="sets and plays your music stream to the entered url" name="CmdLineChatbarMusic" control_name="CmdLineChatbarMusic" width="200"/>
105 <button bottom="-40" follows="left|top" font="SansSerifSmall" height="18" label="?"
106 name="Help_CmdLine" tool_tip="Click here for help regarding the settings in this page."
107 right="-10" width="18"/>
108</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
7053</notification> 7053</notification>
7054 7054
7055<notification 7055<notification
7056 icon="alertmodal.tga" 7056 icon="alert.tga"
7057 label="Emerald Help" 7057 name="Help_CmdLine"
7058 name="EmeraldHelp_CmdLine" 7058 type="alert">
7059 type="alertmodal"> 7059Various options for command line features.
7060Various Options For Command Line features. 7060
7061To use a command, type it in your chat bar (Local chat) and press enter. 7061To use a command, type it in your chat bar (Local Chat) and press enter.
7062</notification> 7062</notification>
7063 7063
7064<notification 7064<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 @@
98 mouse_opaque="true" name="auto_close_ooc" 98 mouse_opaque="true" name="auto_close_ooc"
99 radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)." 99 radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
100 width="256" /> 100 width="256" />
101 <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
102 initial_value="false" label="Use the chatbar as a command line" left="12"
103 mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
104 <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" width="150"
105 label="Chatbar Commands" name="command_line_btn" left="12"
106 tool_tip="Set specific chatbar command line commands here" />
101 107
102 <!-- Uncomment when we start using the crash logger - MC --> 108 <!-- Uncomment when we start using the crash logger - MC -->
103 <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 109 <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -120,119 +126,10 @@
120 </combo_item> 126 </combo_item>
121 </combo_box>--> 127 </combo_box>-->
122 128
123 <button bottom="30" follows="left|top" font="SansSerifSmall" height="20" width="250" 129 <button bottom="30" follows="left|top" font="SansSerifSmall" height="20" width="250"
124 label="Reset All Preferences To Default" name="reset_btn" left="12" 130 label="Reset All Preferences To Default" name="reset_btn" left="12"
125 tool_tip="Reset all preferences to their default values (requires a restart)" /> 131 tool_tip="Reset all preferences to their default values (requires a restart)" />
126 </panel> 132 </panel>
127
128 <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="CmdLine"
129 left="1" mouse_opaque="true" name="CmdLine" width="418">
130 <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?"
131 name="EmeraldHelp_CmdLine" tool_tip="Click here for help regarding the settings in this page."
132 right="490" width="18"/>
133 <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
134 initial_value="false" label="Enable usage of chat bar as a command line" left="5"
135 mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270" control_name="EmeraldCmdLine"/>
136 <text bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
137 name="loltxt2" width="512"> Teleport within sim (usage: cmd x y z)</text>
138 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
139 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
140 tool_tip="" name="EmeraldCmdLinePos" control_name="EmeraldCmdLinePos" width="200"/>
141 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
142 name="loltxt3" width="512"> Teleport to ground (usage: cmd)</text>
143 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
144 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
145 tool_tip="" name="EmeraldCmdLineGround" control_name="EmeraldCmdLineGround" width="200"/>
146 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
147 name="loltxt4" width="512"> Teleport to altitude (usage: cmd z)</text>
148 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
149 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
150 tool_tip="" name="EmeraldCmdLineHeight" control_name="EmeraldCmdLineHeight" width="200"/>
151 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
152 name="loltxt5" width="512"> Teleport home (usage: cmd)</text>
153 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
154 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
155 tool_tip="" name="EmeraldCmdLineTeleportHome" control_name="EmeraldCmdLineTeleportHome"
156 width="200"/>
157 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
158 name="loltxt6" width="512"> Rez a platform (usage: cmd 0 - 30)</text>
159 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
160 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
161 tool_tip="" name="EmeraldCmdLineRezPlatform" control_name="EmeraldCmdLineRezPlatform"
162 width="200"/>
163 <slider bottom_delta="-20" left="15" name="EmeraldCmdLinePlatformSize" control_name="EmeraldCmdLinePlatformSize"
164 decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
165 initial_val="5" label="Width" label_width="30" max_val="30" min_val="5"
166 mouse_opaque="true" show_text="true" width="200" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
167 <text bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
168 name="loltxt7" width="512"> Teleport to sim x (usage: cmd simname)</text>
169 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
170 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
171 tool_tip="" name="EmeraldCmdLineMapTo" control_name="EmeraldCmdLineMapTo" width="200"/>
172 <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
173 initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
174 name="toggle" radio_style="false" width="270" control_name="EmeraldCmdLineMapToKeepPos"/>
175 <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
176 name="loltxt8" width="512"> Calc. expressions (usage: cmd SIN(2+2))</text>
177 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
178 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
179 tool_tip="" name="EmeraldCmdLineCalc" control_name="EmeraldCmdLineCalc" width="200"/>
180 <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
181 width="512">Add autocorrect word(cmd list|bad|good)</text>
182 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
183 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
184 tool_tip="" name="EmeraldCmdLineAutocorrect" control_name="EmeraldCmdLineAutocorrect" width="200"/>
185
186 <text bottom_delta="326" follows="left|top" font="SansSerifSmall" height="16" left_delta="230"
187 name="loltxt9" width="512"> Change Draw Distance (usage: cmd meters)</text>
188 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
189 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
190 tool_tip="" name="EmeraldCmdLineDrawDistance" control_name="EmeraldCmdLineDrawDistance"
191 width="200"/>
192 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
193 name="loltxt10" width="512"> Teleport to cam position (usage: cmd)</text>
194 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
195 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
196 tool_tip="" name="EmeraldCmdTeleportToCam" control_name="EmeraldCmdTeleportToCam"
197 width="200"/>
198 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
199 name="loltxt11" width="512"> Get avatar name from key (usage: cmd key)</text>
200 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
201 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
202 tool_tip="" name="EmeraldCmdLineKeyToName" control_name="EmeraldCmdLineKeyToName"
203 width="200"/>
204 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
205 name="loltxt12" width="512"> Offer teleport to avatar (usage: cmd key)</text>
206 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
207 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
208 tool_tip="" name="EmeraldCmdLineOfferTp" control_name="EmeraldCmdLineOfferTp" width="200"/>
209 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
210 name="loltxt13" width="512"> Teleport to avatar (usage: cmd name)</text>
211 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
212 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
213 tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
214 name="EmeraldCmdLineTP2" control_name="EmeraldCmdLineTP2" width="200"/>
215 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
216 name="loltxt14" width="512"> Turn AO on/off (usage: cmd on/off)</text>
217 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
218 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
219 tool_tip="" name="EmeraldCmdLineAO" control_name="EmeraldCmdLineAO" width="200"/>
220 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
221 name="loltxt15" width="512"> Clear the chat history (usage: cmd)</text>
222 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
223 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
224 tool_tip="Clears the Chat History to prevent lag effects from chat spammers." name="EmeraldCmdLineClearChat" control_name="EmeraldCmdLineClearChat" width="200"/>
225 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
226 name="loltxt15" width="512"> Set the media url (usage: cmd url type)</text>
227 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
228 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
229 tool_tip="Sets and plays your media stream to the entered url" name="EmeraldCmdLineMedia" control_name="EmeraldCmdLineMedia" width="200"/>
230 <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
231 name="loltxt15" width="512"> Set the music stream url (usage: cmd url)</text>
232 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
233 font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
234 tool_tip="sets and plays your music stream to the entered url" name="EmeraldCmdLineMusic" control_name="EmeraldCmdLineMusic" width="200"/>
235 </panel>
236 133
237 <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck" 134 <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
238 left="1" mouse_opaque="true" name="SpellCheck" width="418"> 135 left="1" mouse_opaque="true" name="SpellCheck" width="418">
generated by cgit v1.1 at 2025-02-27 21:16:22 +0000