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 | 43b0a2bde4beecb08585ef1fb9003720cf5cdc7b (patch) | |
| tree | 7e91bd1f709a8ccaa76c4fee45a79f3036cb2e4c /indra/newview | |
| parent | 3d86755b7e430be9b469dd66635b88650de9f31a (diff) | |
| parent | 9e2ca85e7d09369314da364936ac3b409e609e8c (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" |