From 1e8922ba6166efdd8452b2a94a61703cd58f9418 Mon Sep 17 00:00:00 2001 From: JessicaLyon Date: Fri, 21 Jan 2011 12:13:21 -0500 Subject: [PATCH 1/4] Added ability to show/hide side bar buttons home, places, profile located at the bottom bar. --- indra/newview/app_settings/settings.xml | 22 + indra/newview/llbottomtray.cpp | 8 + indra/newview/llbottomtray.h | 3 + .../skins/default/xui/en/menu_bottomtray.xml | 22 + .../firestorm/xui/en/panel_bottomtray.xml | 1334 ++++++++--------- 5 files changed, 722 insertions(+), 667 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 32f326238b..44083102c3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9303,6 +9303,28 @@ Value 1 + ShowMeButton + + Comment + Shows/Hides profile sidebar button in the bottom tray. + Persist + 1 + Type + Boolean + Value + 1 + + ShowPlacesButton + + Comment + Shows/Hides the places sidebar button in the bottom tray. + Persist + 1 + Type + Boolean + Value + 1 + ShowMoveButton Comment diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 9680086823..4e69cf2d74 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -1565,6 +1565,8 @@ void LLBottomTray::initResizeStateContainers() mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_WORLD_MAP, getChild("world_map_btn_panel"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_MINI_MAP, getChild("mini_map_btn_panel"))); mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_HOME, getChild("bottom_sbhome"))); + mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_ME, getChild("bottom_sbme"))); + mStateProcessedObjectMap.insert(std::make_pair(RS_BUTTON_PLACES, getChild("bottom_sbplaces"))); // init an order of processed buttons mButtonsProcessOrder.push_back(RS_BUTTON_GESTURES); @@ -1576,6 +1578,8 @@ void LLBottomTray::initResizeStateContainers() mButtonsProcessOrder.push_back(RS_BUTTON_WORLD_MAP); mButtonsProcessOrder.push_back(RS_BUTTON_MINI_MAP); mButtonsProcessOrder.push_back(RS_BUTTON_HOME); + mButtonsProcessOrder.push_back(RS_BUTTON_ME); + mButtonsProcessOrder.push_back(RS_BUTTON_PLACES); mButtonsOrder.push_back(RS_BUTTON_SPEAK); mButtonsOrder.insert(mButtonsOrder.end(), mButtonsProcessOrder.begin(), mButtonsProcessOrder.end()); @@ -1615,6 +1619,8 @@ void LLBottomTray::initButtonsVisibility() setVisibleAndFitWidths(RS_BUTTON_WORLD_MAP, gSavedSettings.getBOOL("ShowWorldMapButton")); setVisibleAndFitWidths(RS_BUTTON_MINI_MAP, gSavedSettings.getBOOL("ShowMiniMapButton")); setVisibleAndFitWidths(RS_BUTTON_HOME, gSavedSettings.getBOOL("ShowHomeButton")); + setVisibleAndFitWidths(RS_BUTTON_ME, gSavedSettings.getBOOL("ShowMeButton")); + setVisibleAndFitWidths(RS_BUTTON_PLACES, gSavedSettings.getBOOL("ShowPlacesButton")); } void LLBottomTray::setButtonsControlsAndListeners() @@ -1628,6 +1634,8 @@ void LLBottomTray::setButtonsControlsAndListeners() gSavedSettings.getControl("ShowWorldMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_WORLD_MAP, _2)); gSavedSettings.getControl("ShowMiniMapButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_MINI_MAP, _2)); gSavedSettings.getControl("ShowHomeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_HOME, _2)); + gSavedSettings.getControl("ShowMeButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_ME, _2)); + gSavedSettings.getControl("ShowPlacesButton")->getSignal()->connect(boost::bind(&LLBottomTray::toggleShowButton, RS_BUTTON_PLACES, _2)); LLButton* build_btn = getChild("build_btn"); diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index c256f289c6..3a9ba8ce66 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -155,6 +155,8 @@ private: , RS_BUTTON_WORLD_MAP = 0x0800 , RS_BUTTON_MINI_MAP = 0x1000 , RS_BUTTON_HOME = 0x2000 + , RS_BUTTON_ME = 0x4000 + , RS_BUTTON_PLACES = 0x8000 /* Once new button that can be hidden on resize is added don't forget to update related places: @@ -169,6 +171,7 @@ private: */ , RS_BUTTONS_CAN_BE_HIDDEN = RS_BUTTON_SNAPSHOT | RS_BUTTON_CAMERA | RS_BUTTON_MOVEMENT | RS_BUTTON_GESTURES | RS_BUTTON_BUILD | RS_BUTTON_SEARCH | RS_BUTTON_WORLD_MAP | RS_BUTTON_MINI_MAP | RS_BUTTON_HOME + | RS_BUTTON_ME | RS_BUTTON_PLACES }EResizeState; // Below are three methods that were introduced to handle drag'n'drop diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index 5d04fcc4c2..23eb6b45d5 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -107,6 +107,28 @@ function="CheckControl" parameter="ShowHomeButton" /> + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - + name="gesture_panel" + top_delta="0" + user_resize="false" + width="76"> + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + halign="center" + height="23" + image_overlay="Unread_IM" + image_overlay_alignment="center" + image_pressed="WellButton_Lit" + image_pressed_selected="WellButton_Lit_Selected" + image_selected="PushButton_Press" + label_color="Black" + left="0" + name="Unread IM messages" + tool_tip="Conversations" + width="34"> + + + + + + + + + + + From 5e18fdade83cfabd07f5912d6e1e61d88b54f5de Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Fri, 21 Jan 2011 15:11:48 -0600 Subject: [PATCH 2/4] Fix bottom right button not selectable all the way to the bottom. --- indra/newview/skins/default/xui/en/floater_camera.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index d02803d7ae..a4cdd8b53c 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -244,7 +244,7 @@ Date: Fri, 21 Jan 2011 16:50:35 -0500 Subject: [PATCH 3/4] Added patch provided by Satomi Ahn, FIRE-264. Fixes inventory text filtering issue which exist in the LL viewer. Thanks for the patch! --- indra/newview/llinventoryfilter.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 33c66f0877..18385b7ce6 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -409,16 +409,20 @@ void LLInventoryFilter::setFilterSubString(const std::string& string) { if (mFilterSubString != string) { + std::string filterSubStringNew = string; + LLStringUtil::trimHead(filterSubStringNew); + mFilterSubStringOrig = filterSubStringNew; + LLStringUtil::toUpper(filterSubStringNew); + // hitting BACKSPACE, for example - const BOOL less_restrictive = mFilterSubString.size() >= string.size() && !mFilterSubString.substr(0, string.size()).compare(string); + const BOOL less_restrictive = mFilterSubString.size() >= filterSubStringNew.size() + && !mFilterSubString.substr(0, filterSubStringNew.size()).compare(filterSubStringNew); // appending new characters - const BOOL more_restrictive = mFilterSubString.size() < string.size() && !string.substr(0, mFilterSubString.size()).compare(mFilterSubString); + const BOOL more_restrictive = mFilterSubString.size() < filterSubStringNew.size() + && !filterSubStringNew.substr(0, mFilterSubString.size()).compare(mFilterSubString); - mFilterSubStringOrig = string; - LLStringUtil::trimHead(mFilterSubStringOrig); - mFilterSubString = mFilterSubStringOrig; - LLStringUtil::toUpper(mFilterSubString); + mFilterSubString = filterSubStringNew; if (less_restrictive) { setModified(FILTER_LESS_RESTRICTIVE); From 27bf8282092a24ec86420b313d993dd545a0a439 Mon Sep 17 00:00:00 2001 From: JessicaLyon Date: Fri, 21 Jan 2011 17:16:00 -0500 Subject: [PATCH 4/4] Applied 1 line patch from Satomi Ahn, FIRE-324. Nearby and IM chat bars forget what was written after browsing history. Issue exists in the LL Viewer. Thanks for the patch! --- indra/llui/lllineeditor.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index ba73b74052..09b9677dcd 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1308,6 +1308,7 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) { if( mCurrentHistoryLine > mLineHistory.begin() ) { + (*mCurrentHistoryLine).assign(getText()); mText.assign( *(--mCurrentHistoryLine) ); setCursorToEnd(); }