From 39905b927d60e204438705728d2c214cb3f9ef81 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 2 Jul 2009 00:38:13 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 --- indra/newview/llmenucommands.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llmenucommands.cpp') diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index 80bc2ad861..f0bfbef565 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -84,8 +84,8 @@ void handle_mouselook(void*) void handle_chat(void*) { // give focus to chatbar if it's open but not focused - if (gSavedSettings.getBOOL("ChatVisible") && gFocusMgr.childHasKeyboardFocus( - LLBottomTray::getInstance()->getChatBox())) + if (gBottomTray && gSavedSettings.getBOOL("ChatVisible") && + gFocusMgr.childHasKeyboardFocus(gBottomTray->getChatBox())) { LLChatBar::stopChat(); } -- cgit v1.2.3 From 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 7 Jul 2009 00:53:05 +0000 Subject: Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14 --- indra/newview/llmenucommands.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llmenucommands.cpp') diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index f0bfbef565..c0225ebfca 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -51,7 +51,7 @@ #include "llfloaterdirectory.h" #include "llfloaterworldmap.h" #include "llgivemoney.h" -#include "llinventoryview.h" +#include "llfloaterinventory.h" #include "llnotify.h" #include "llstatusbar.h" #include "llimview.h" -- cgit v1.2.3 From 73a97010e6c8c7874fdc1778ab46e492f77d9394 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 21 Jul 2009 00:57:23 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 --- indra/newview/llmenucommands.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'indra/newview/llmenucommands.cpp') diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index c0225ebfca..0c652621f4 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -44,7 +44,6 @@ #include "llagent.h" #include "llcallingcard.h" -#include "llchatbar.h" #include "llviewercontrol.h" #include "llfirstuse.h" #include "llfloaterchat.h" @@ -84,20 +83,20 @@ void handle_mouselook(void*) void handle_chat(void*) { // give focus to chatbar if it's open but not focused - if (gBottomTray && gSavedSettings.getBOOL("ChatVisible") && - gFocusMgr.childHasKeyboardFocus(gBottomTray->getChatBox())) + if (gSavedSettings.getBOOL("ChatVisible") && + gFocusMgr.childHasKeyboardFocus(LLBottomTray::getInstance()->getChatBox())) { - LLChatBar::stopChat(); + LLBottomTray::stopChat(); } else { - LLChatBar::startChat(NULL); + LLBottomTray::startChat(NULL); } } void handle_slash_key(void*) { - // LLChatBar::startChat("/"); + // LLBottomTray::startChat("/"); // // Don't do this, it results in a double-slash in the input field. // Another "/" will be automatically typed for us, because the WM_KEYDOWN event @@ -107,5 +106,5 @@ void handle_slash_key(void*) // menu accelerators that put input focus into a field. And Mac works // the same way. JC - LLChatBar::startChat(NULL); + LLBottomTray::startChat(NULL); } -- cgit v1.2.3 From 8f7ec64899c54dcee6caa0307510cc4003ba7bdd Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 27 Jul 2009 17:56:26 +0000 Subject: Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry --- indra/newview/llmenucommands.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llmenucommands.cpp') diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index 0c652621f4..cfcb331912 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -51,6 +51,7 @@ #include "llfloaterworldmap.h" #include "llgivemoney.h" #include "llfloaterinventory.h" +#include "lllineeditor.h" #include "llnotify.h" #include "llstatusbar.h" #include "llimview.h" -- cgit v1.2.3 From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 30 Jul 2009 23:22:41 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 --- indra/newview/llmenucommands.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llmenucommands.cpp') diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp index cfcb331912..efa15e05da 100644 --- a/indra/newview/llmenucommands.cpp +++ b/indra/newview/llmenucommands.cpp @@ -67,7 +67,7 @@ #include "llworld.h" #include "llworldmap.h" #include "llfocusmgr.h" -#include "llbottomtray.h" +#include "llnearbychatbar.h" void handle_pay_by_id(const LLUUID& agent_id) { @@ -85,13 +85,13 @@ void handle_chat(void*) { // give focus to chatbar if it's open but not focused if (gSavedSettings.getBOOL("ChatVisible") && - gFocusMgr.childHasKeyboardFocus(LLBottomTray::getInstance()->getChatBox())) + gFocusMgr.childHasKeyboardFocus(LLNearbyChatBar::getInstance()->getChatBox())) { - LLBottomTray::stopChat(); + LLNearbyChatBar::stopChat(); } else { - LLBottomTray::startChat(NULL); + LLNearbyChatBar::startChat(NULL); } } @@ -107,5 +107,5 @@ void handle_slash_key(void*) // menu accelerators that put input focus into a field. And Mac works // the same way. JC - LLBottomTray::startChat(NULL); + LLNearbyChatBar::startChat(NULL); } -- cgit v1.2.3