diff options
| author | Richard Nelson <none@none> | 2010-06-07 16:49:06 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-07 16:49:06 -0700 |
| commit | a1f21c968e3791bd8c613bc7b5073789b1bcc0d7 (patch) | |
| tree | 7a5340fcfe560822bc54d0cb642d84002dfab0b3 | |
| parent | d50ab8b58a45c55888ddebbb77ec0a2209d286a5 (diff) | |
EXT-7700 - Script error window shows [All Scripts] for every tab
reviewed by Mani
| -rw-r--r-- | indra/llui/llfloater.cpp | 5 | ||||
| -rw-r--r-- | indra/llui/llmultifloater.cpp | 10 | ||||
| -rw-r--r-- | indra/llui/llmultifloater.h | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index fad98e553f..341debc9a8 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -810,6 +810,11 @@ void LLFloater::applyTitle() { mDragHandle->setTitle ( mTitle ); } + + if (getHost()) + { + getHost()->updateFloaterTitle(this); + } } std::string LLFloater::getCurrentTitle() const diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 3aea648562..b1dbce0000 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -238,6 +238,16 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater, moveResizeHandlesToFront(); } +void LLMultiFloater::updateFloaterTitle(LLFloater* floaterp) +{ + S32 index = mTabContainer->getIndexForPanel(floaterp); + if (index != -1) + { + mTabContainer->setPanelTitle(index, floaterp->getShortTitle()); + } +} + + /** BOOL selectFloater(LLFloater* floaterp) diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h index bbf2c56fe7..24a841f64e 100644 --- a/indra/llui/llmultifloater.h +++ b/indra/llui/llmultifloater.h @@ -80,6 +80,7 @@ public: void onTabSelected(); virtual void updateResizeLimits(); + virtual void updateFloaterTitle(LLFloater* floaterp); protected: struct LLFloaterData |