diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:25:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:25:52 -0400 |
| commit | d8b96c686d171bc0e199e462e350d3e7373c5bb3 (patch) | |
| tree | 29ee2f4935880ec150268a03987374a47b82390b | |
| parent | bf8ee428136b4c38500fb72642d0f75b24057f60 (diff) | |
| parent | 8511dbca1f2d10fbf7fc0d2aab7d28515520dd95 (diff) | |
automated merge
| -rw-r--r-- | indra/newview/featuretable.txt | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/inspect_avatar.xml | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 4029bf95a0..5f31ccbb19 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -296,28 +296,23 @@ RenderUseImpostors 0 0 list Intel_945GM RenderTerrainDetail 1 0 RenderVBOEnable 1 0 -RenderUseImpostors 0 0 list Intel_945G RenderTerrainDetail 1 0 RenderVBOEnable 1 0 -RenderUseImpostors 0 0 list Intel_950 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 -RenderUseImpostors 0 0 list Intel_965 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 UseOcclusion 0 0 -RenderUseImpostors 0 0 list Intel_G33 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 -RenderUseImpostors 0 0 list Intel_G45 WindLightUseAtmosShaders 0 0 diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml index aeac0a8328..fb4937242b 100644 --- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml @@ -20,7 +20,7 @@ <button label="IM" name="im_btn"/> <button label="プロフィール" name="view_profile_btn"/> <panel name="moderator_panel"> - <button label="ボイスを無効にする" name="disable_voice"/> - <button label="ボイスを有効にする" name="enable_voice"/> + <button label="ボイスを無効" name="disable_voice"/> + <button label="ボイスを有効" name="enable_voice"/> </panel> </floater> |