aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-06-10 19:06:20 -0700
committerMcCabe Maxsted2011-06-10 19:06:20 -0700
commit06025b4390c3ab6c47aa895afe18e1bbf559f188 (patch)
tree738fb042a0ed079b9817eeda8e72d438afa3283a /linden
parentCheck for when a profile's born on date field gets sent invalid data (diff)
downloadmeta-impy-06025b4390c3ab6c47aa895afe18e1bbf559f188.zip
meta-impy-06025b4390c3ab6c47aa895afe18e1bbf559f188.tar.gz
meta-impy-06025b4390c3ab6c47aa895afe18e1bbf559f188.tar.bz2
meta-impy-06025b4390c3ab6c47aa895afe18e1bbf559f188.tar.xz
Show tooltips on profile pick tabs (lousy workaround for most names being too big too fit)
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/lltabcontainer.h10
-rw-r--r--linden/indra/newview/llpanelavatar.cpp9
2 files changed, 16 insertions, 3 deletions
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 8117cde..989b12c 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -145,7 +145,6 @@ public:
145 145
146 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); 146 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
147 147
148private:
149 // Structure used to map tab buttons to and from tab panels 148 // Structure used to map tab buttons to and from tab panels
150 struct LLTabTuple 149 struct LLTabTuple
151 { 150 {
@@ -176,11 +175,12 @@ private:
176 LLTextBox* mPlaceholderText; 175 LLTextBox* mPlaceholderText;
177 S32 mPadding; 176 S32 mPadding;
178 }; 177 };
179
180 void initButtons();
181 178
182 LLTabTuple* getTab(S32 index) { return mTabList[index]; } 179 LLTabTuple* getTab(S32 index) { return mTabList[index]; }
183 LLTabTuple* getTabByPanel(LLPanel* child); 180 LLTabTuple* getTabByPanel(LLPanel* child);
181
182 LLTextBox* getTitle() { return mTitleBox; }
183
184 void insertTuple(LLTabTuple * tuple, eInsertionPoint insertion_point); 184 void insertTuple(LLTabTuple * tuple, eInsertionPoint insertion_point);
185 185
186 S32 getScrollPos() const { return mScrollPos; } 186 S32 getScrollPos() const { return mScrollPos; }
@@ -195,6 +195,10 @@ private:
195 195
196 void setCurrentPanelIndex(S32 index) { mCurrentTabIdx = index; } 196 void setCurrentPanelIndex(S32 index) { mCurrentTabIdx = index; }
197 197
198private:
199
200 void initButtons();
201
198 void scrollPrev() { mScrollPos = llmax(0, mScrollPos-1); } // No wrap 202 void scrollPrev() { mScrollPos = llmax(0, mScrollPos-1); } // No wrap
199 void scrollNext() { mScrollPos = llmin(mScrollPos+1, mMaxScrollPos); } // No wrap 203 void scrollNext() { mScrollPos = llmin(mScrollPos+1, mMaxScrollPos); } // No wrap
200 204
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 0a668ba..dc0db8b 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1004,6 +1004,15 @@ void LLPanelAvatarPicks::refresh()
1004 childSetVisible("Delete...", self && getPanelAvatar()->isEditable()); 1004 childSetVisible("Delete...", self && getPanelAvatar()->isEditable());
1005 1005
1006 sendAvatarProfileRequestIfNeeded("avatarpicksrequest"); 1006 sendAvatarProfileRequestIfNeeded("avatarpicksrequest");
1007
1008 for (int i = 0; i < tab_count; ++i)
1009 {
1010 LLTabContainer::LLTabTuple* tab = tabs->getTab(i);
1011 if (tab)
1012 {
1013 tab->mButton->setToolTip(tabs->getPanelTitle(i));
1014 }
1015 }
1007} 1016}
1008 1017
1009 1018