summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-04-06 12:27:42 +0300
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-04-06 12:27:42 +0300
commit10c97a9481142a417ea4009ea30bb51b5ba1fdf0 (patch)
tree18b3f482b0a13df3b0ebd9e43ae10f7164a15500 /indra/newview
parent4a997e96271b6e01b90061bf0479601f68217153 (diff)
Fixed normal bug EXT-6545 - Admin > God Tools > Object > Sim Name incorrectly reported.
Using region name retrieval code. Fixed labels. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/125/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatergodtools.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/floater_god_tools.xml8
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index e7b2da043f..bd07cfdfbf 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -922,6 +922,7 @@ LLPanelObjectTools::~LLPanelObjectTools()
BOOL LLPanelObjectTools::postBuild()
{
+ refresh();
return TRUE;
}
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 240871ec25..dfe3cf4485 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -61,10 +61,10 @@
height="10"
layout="topleft"
left="10"
- name="Sim Name:"
+ name="Region Name:"
top="12"
width="80">
- Sim Name:
+ Region Name:
</text>
<line_editor
border_style="line"
@@ -481,10 +481,10 @@
height="10"
layout="topleft"
left="10"
- name="Sim Name:"
+ name="Region Name:"
top="10"
width="80">
- Sim Name:
+ Region Name:
</text>
<text
type="string"