From a1f21c968e3791bd8c613bc7b5073789b1bcc0d7 Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Mon, 7 Jun 2010 16:49:06 -0700
Subject: [PATCH] EXT-7700 - Script error window shows [All Scripts] for every
tab reviewed by Mani
---
indra/llui/llfloater.cpp | 5 +++++
indra/llui/llmultifloater.cpp | 10 ++++++++++
indra/llui/llmultifloater.h | 1 +
3 files changed, 16 insertions(+)
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fad98e553fd..341debc9a83 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 3aea648562d..b1dbce00007 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 bbf2c56fe71..24a841f64e3 100644
--- a/indra/llui/llmultifloater.h
+++ b/indra/llui/llmultifloater.h
@@ -80,6 +80,7 @@ class LLMultiFloater : public LLFloater
void onTabSelected();
virtual void updateResizeLimits();
+ virtual void updateFloaterTitle(LLFloater* floaterp);
protected:
struct LLFloaterData
--
GitLab