summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-22 21:40:04 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-22 21:40:04 +0100
commit4ef74e89c7677dcc84e412ce1c5648848d3577e5 (patch)
tree3c40386118187a7022d4996acce66e99e9e69e94
parentc2a0de46095315c778edf5c5c37c1de0bdfe82eb (diff)
Backed out changeset 5d5e820de3ef
-rw-r--r--indra/newview/llviewerobject.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml2
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index bae84415d7..7b94e49a2a 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5257,7 +5257,6 @@ public:
}
}
- dialog_refresh_all();
};
};
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f5054cf206..b987cd9108 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1428,7 +1428,7 @@ even though the user gets a free copy.
name="label physicsshapetype"
top_pad="10"
width="121">
- Physics Shape Type:
+ Physics Rep:
</text>
<combo_box
height="23"