diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:10 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:40:10 +0100 |
| commit | b42488efa4ce5792e01e1301894a59386c16742a (patch) | |
| tree | 5eef1b31bd97b6ec980f6906d2a0d490f58f78e0 /indra/newview | |
| parent | c872b2c85ca07e7e87dfb36d6bffe69fddd4660e (diff) | |
| parent | 4ef74e89c7677dcc84e412ce1c5648848d3577e5 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 2 |
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" |