diff options
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/llscrollcontainer.h | 2 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 77 |
5 files changed, 47 insertions, 44 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 402c050d2e..6f1572eda5 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -202,7 +202,7 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask) // NOTE: this should not recurse indefinitely as handleKeyHere // should not propagate to parent controls, so mScrolledView should *not* // call LLScrollContainer::handleKeyHere in turn - if (mScrolledView->handleKeyHere(key, mask)) + if (mScrolledView && mScrolledView->handleKeyHere(key, mask)) { return TRUE; } @@ -335,7 +335,7 @@ BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, void LLScrollContainer::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const { - const LLRect& rect = mScrolledView->getRect(); + const LLRect& rect = getScrolledViewRect(); calcVisibleSize(rect, visible_width, visible_height, show_h_scrollbar, show_v_scrollbar); } diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h index c2d4d2c861..ec4fb0d41f 100644 --- a/indra/llui/llscrollcontainer.h +++ b/indra/llui/llscrollcontainer.h @@ -86,7 +86,7 @@ public: void scrollToShowRect( const LLRect& rect, const LLCoordGL& desired_offset ); void setReserveScrollCorner( BOOL b ) { mReserveScrollCorner = b; } - const LLRect& getScrolledViewRect() const { return mScrolledView->getRect(); } + const LLRect& getScrolledViewRect() const { return mScrolledView ? mScrolledView->getRect() : LLRect::null; } void pageUp(S32 overlap = 0); void pageDown(S32 overlap = 0); void goToTop(); diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index fa0ab0ea3f..6ad483a2f1 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1372,7 +1372,6 @@ LLUUID LLIMMgr::addSession( //LLFloaterReg::showInstance("communicate", session_id); // *NOTE: Is this right? Or should we only do it for // dialog == IM_NOTHING_SPECIAL and some group types? - LLIMFloater::show(session_id); // Only warn for regular IMs - not group IMs if( dialog == IM_NOTHING_SPECIAL ) @@ -1388,6 +1387,7 @@ LLUUID LLIMMgr::addSession( } //mTabContainer->selectTabPanel(panel); floater->setInputFocus(TRUE); + LLIMFloater::show(session_id); notifyObserverSessionAdded(floater->getSessionID(), name, other_participant_id); return floater->getSessionID(); } diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index a8e3fd3195..630970fcf5 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -651,10 +651,14 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLAvatarList* list) if (clicked_id.isNull()) return; - + +#if 0 // SJB: Useful for testing, but not currently functional or to spec // Open mini-inspector for the avatar being clicked LLFloaterReg::showInstance("mini_inspector", clicked_id); // inspector will delete itself on close +#else // spec says open IM window + LLAvatarActions::startIM(clicked_id); +#endif } void LLPanelPeople::onAvatarListCommitted(LLAvatarList* list) diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 6aa42185f7..629f1d260a 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -136,7 +136,7 @@ top="10" width="20" /> <text - follows="left|right|bottom" + follows="left|right|bottom|top" font="SansSerifBold" height="120" layout="topleft" @@ -150,52 +150,51 @@ Change your profile, your look and quick links to your outfits. </text> </panel> - <panel - background_opaque="false" + <panel background_visible="true" - bg_alpha_color="0.3 0.3 0.3 1.0" - class="panel_sidetray_home_info"> + bg_alpha_color="DkGray2" + class="panel_sidetray_home_info" follows="left|top|right" - height="130" - left="10" + height="130" + layout="topleft" + left="10" name="sidebar_appearance" - width="280" + width="280"> <text follows="left|right|top" - font="SansSerifHugeBold" - height="30" - left="5" - mouse_opaque="false" - name="tab_name" > - text_color="white" - width="200" - word_wrap="true" - top="-10" - Appearance - </text> + font="SansSerifBigBold" + height="30" + layout="topleft" + left="5" + mouse_opaque="false" + name="tab_name" + text_color="white" + top="10" + value="My Appearance" + width="200" + word_wrap="true" /> <icon - top="-10" - right="-10" - width="20" - height="20" + color="DkGray" follows="top|right" - color="1 1 1 1" - enabled="true" - image_name="inv_item_shirt.tga" - mouse_opaque="false" - name="tab_icon"/> + height="20" + layout="topleft" + name="tab_icon" + right="-10" + top="10" + width="20" /> <text - top="-40" - left="10" - right="-10" - height="120" - follows="left|right|bottom" - font="SansSerifBig" - text_color="white" - word_wrap="true" - mouse_opaque="false" - name="tab_description" > - Change your appearance. + follows="left|right|bottom|top" + font="SansSerifBold" + height="120" + layout="topleft" + left="10" + mouse_opaque="false" + name="tab_description" + right="-10" + text_color="white" + top="40" + word_wrap="true"> + Change your appearance. </text> </panel> </panel> |