summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-05 16:30:11 -0800
committerrichard <none@none>2009-11-05 16:30:11 -0800
commit29d8ee76f12e151c0e305933cc7de2daed661430 (patch)
treea3bc4e0aadb45d39c230aa2cccf647af62dddb02 /indra/newview
parent93e877a5ce9208f37872614a5b4ee2fabc3cbf11 (diff)
LLChiclet cleans up its connection to LLTransientFloaterMgr now
and panel_stand_stop_flying is visible by default while its contents are not
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llchiclet.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 53c4bb32ca..c200a97058 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -812,6 +812,8 @@ LLChicletPanel::LLChicletPanel(const Params&p)
LLChicletPanel::~LLChicletPanel()
{
+ LLTransientFloaterMgr::getInstance()->removeControlView(mLeftScrollButton);
+ LLTransientFloaterMgr::getInstance()->removeControlView(mRightScrollButton);
}
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index c8703aa895..b48943c699 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -5,7 +5,7 @@
layout="topleft"
name="panel_stand_stop_flying"
mouse_opaque="false"
- visible="false"
+ visible="true"
width="115">
<button
follows="left|bottom"