diff options
| -rw-r--r-- | indra/newview/llfloaterregionrestarting.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterregionrestarting.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_region_restarting.xml | 36 |
3 files changed, 28 insertions, 13 deletions
diff --git a/indra/newview/llfloaterregionrestarting.cpp b/indra/newview/llfloaterregionrestarting.cpp index 899216b966..003ed488c6 100644 --- a/indra/newview/llfloaterregionrestarting.cpp +++ b/indra/newview/llfloaterregionrestarting.cpp @@ -44,6 +44,7 @@ LLFloaterRegionRestarting::LLFloaterRegionRestarting(const LLSD& key) : LLFloaterRegionRestarting::~LLFloaterRegionRestarting() { + mRegionChangedConnection.disconnect(); } BOOL LLFloaterRegionRestarting::postBuild() @@ -58,7 +59,7 @@ BOOL LLFloaterRegionRestarting::postBuild() refresh(); - gAgent.addRegionChangedCallback(boost::bind(&LLFloaterRegionRestarting::regionChange, this)); + mRegionChangedConnection = gAgent.addRegionChangedCallback(boost::bind(&LLFloaterRegionRestarting::regionChange, this)); return TRUE; } diff --git a/indra/newview/llfloaterregionrestarting.h b/indra/newview/llfloaterregionrestarting.h index fef0dcddfe..6ff067e0a8 100644 --- a/indra/newview/llfloaterregionrestarting.h +++ b/indra/newview/llfloaterregionrestarting.h @@ -48,6 +48,8 @@ private: virtual void regionChange(); std::string mName; + + boost::signals2::connection mRegionChangedConnection; }; #endif // LL_LLFLOATERREGIONRESTARTING_H diff --git a/indra/newview/skins/default/xui/en/floater_region_restarting.xml b/indra/newview/skins/default/xui/en/floater_region_restarting.xml index dcb5fcc41d..2fe4d0190a 100644 --- a/indra/newview/skins/default/xui/en/floater_region_restarting.xml +++ b/indra/newview/skins/default/xui/en/floater_region_restarting.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="245" - width="500" + height="150" + width="290" layout="topleft" name="region_restarting" help_topic="floater_region_restarting" @@ -17,16 +17,27 @@ If you stay in this region you will be logged out. Seconds until restart [SECONDS] </string> - <panel + <panel name="layout_panel_1" - height="245" - width="500" + height="150" + width="290" follows="right|top" top="0" left="0" background_visible="true" bg_opaque_color="Orange" bg_alpha_color="Orange"> + + <icon color="1.0 1.0 1.0 1.0" + tab_stop="false" + mouse_opaque="false" + name="icon" + width="32" + height="32" + image_name="notify_caution_icon.tga" + follows="left|top"> + </icon> + <text type="string" length="1" @@ -34,12 +45,12 @@ If you stay in this region you will be logged out. layout="topleft" name="region_name" text_color="Black" - font="SansSerifLarge" + font="SansSerifBold" word_wrap="true" height="100" - top="30" - left="10" - width="480"> + top="5" + left="40" + width="230"> The region you are in now (-The longest region name-) is about to restart. If you stay in this region you will be logged out. @@ -51,11 +62,12 @@ If you stay in this region you will be logged out. layout="topleft" name="restart_seconds" text_color="Black" - font="SansSerifHuge" - height="100" + font="SansSerifLargeBold" + height="40" + top="110" left="0" halign="center" - width="500"> + width="290"> Seconds until restart 32767 </text> |