From 65bdb537531141bcfb00163888540624a600a17b Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 10 Mar 2011 06:44:03 -0500 Subject: STORM-1064 People sidebar panel elements have inconsistent widths and map is slightly too tall --- doc/contributions.txt | 1 + .../newview/skins/default/xui/en/panel_people.xml | 26 +++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index e94acb566a..c44e3fe5d8 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -407,6 +407,7 @@ Jonathan Yap VWR-17801 VWR-24347 STORM-990 + STORM-1064 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 43431ea7c1..1a00416b2a 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -76,7 +76,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M follows="all" height="383" layout="topleft" - left="5" + left="3" name="tabs" tab_group="1" tab_min_width="70" @@ -84,7 +84,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M tab_position="top" top_pad="10" halign="center" - width="317"> + width="319"> + top="5"/> + width="306" /> @@ -251,7 +251,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M top_pad="1" left="0" name="bottom_panel" - width="305"> + width="308"> + width="210"> + width="210" /> @@ -506,7 +506,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" top_pad="0" width="313"> @@ -544,7 +544,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M layout="topleft" left_pad="1" name="dummy_icon" - width="241" + width="244" /> -- cgit v1.2.3 From b6e6ba224620e0b122062c88f40295c10ce8db2d Mon Sep 17 00:00:00 2001 From: Paul ProductEngine Date: Thu, 10 Mar 2011 14:21:35 +0200 Subject: STORM-357 FIXED Gestures button is in the pressed state after drag-n-drop but gestures list isn't visible. - Because the Gesture Combo List isn't child of gViewerWindow->getNonSideTrayView(), after focus lost the gesture list becomes hidden under world. To avoid this, send child to front in each draw. --- indra/newview/llnearbychatbar.cpp | 11 +++++++++++ indra/newview/llnearbychatbar.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 836ae9a0cf..162e465fef 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -157,6 +157,16 @@ BOOL LLGestureComboList::handleKeyHere(KEY key, MASK mask) return handled; } +void LLGestureComboList::draw() +{ + LLUICtrl::draw(); + + if(mButton->getToggleState()) + { + showList(); + } +} + void LLGestureComboList::showList() { LLRect rect = mList->getRect(); @@ -180,6 +190,7 @@ void LLGestureComboList::showList() // Show the list and push the button down mButton->setToggleState(TRUE); mList->setVisible(TRUE); + sendChildToFront(mList); LLUI::addPopup(mList); } diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 033d1dd5a2..96ab45071b 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -72,6 +72,8 @@ public: virtual void hideList(); virtual BOOL handleKeyHere(KEY key, MASK mask); + virtual void draw(); + S32 getCurrentIndex() const; void onItemSelected(const LLSD& data); void sortByName(bool ascending = true); -- cgit v1.2.3 From 47b3d76790f3232db485a1dc909361bb31a38013 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 15 Mar 2011 16:12:43 -0400 Subject: Added tag 2.6.0-start for changeset 4e9eec6a347f --- .hgtags | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.hgtags b/.hgtags index 5eed83f2ca..8d5f290ff6 100644 --- a/.hgtags +++ b/.hgtags @@ -77,3 +77,5 @@ b53a0576eec80614d7767ed72b40ed67aeff27c9 DRTVWR-38_2.5.2-release b53a0576eec80614d7767ed72b40ed67aeff27c9 2.5.2-release 92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start +f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start +4e9eec6a347f89b2b3f295beb72f1cf7837dff66 2.6.0-start -- cgit v1.2.3 From 742dd75751f65224d80eb4f7d20daf5a21776c5f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 15 Mar 2011 16:14:07 -0400 Subject: increment viewer version to 2.6.1 --- BuildParams | 5 +++++ indra/llcommon/llversionviewer.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/BuildParams b/BuildParams index 934bed6c5f..d4b1800508 100644 --- a/BuildParams +++ b/BuildParams @@ -48,6 +48,11 @@ viewer-beta.login_channel = "Second Life Beta Viewer" viewer-beta.build_debug_release_separately = true viewer-beta.build_viewer_update_version_manager = true +viewer-pre-beta.viewer_channel = "Second Life Beta Viewer" +viewer-pre-beta.login_channel = "Second Life Beta Viewer" +viewer-pre-beta.build_debug_release_separately = true +viewer-pre-beta.build_viewer_update_version_manager = true + # ======================================== # Viewer Release # ======================================== diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7d5afe92dc..117d96ffa6 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 6; -const S32 LL_VERSION_PATCH = 0; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; -- cgit v1.2.3