diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-11 12:32:53 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-11 12:32:53 -0700 |
| commit | c16110595bdec2a666c4a5d92cb43430c3233c95 (patch) | |
| tree | fb93626ce357e7ddefed61ceeaf822a9e212b83f | |
| parent | ef021ddc9af1829a519edd5e6b7127be3afd57bc (diff) | |
| parent | 8511dbca1f2d10fbf7fc0d2aab7d28515520dd95 (diff) | |
automated merge and fix build break on snow leopard (it's a warning on leopard on parabuild)
| -rw-r--r-- | indra/newview/featuretable.txt | 5 | ||||
| -rw-r--r-- | indra/newview/llinventoryicon.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/ja/inspect_avatar.xml | 4 |
3 files changed, 3 insertions, 8 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/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 474076b541..81c12406c2 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -136,7 +136,7 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type, idx = (misc_flag != 0) ? ICONNAME_CALLINGCARD_ONLINE : ICONNAME_CALLINGCARD_OFFLINE; break; case LLAssetType::AT_LANDMARK: - idx = (misc_flag != 0) ? ICONNAME_LANDMARK_VISITED : idx = ICONNAME_LANDMARK; + idx = (misc_flag != 0) ? ICONNAME_LANDMARK_VISITED : ICONNAME_LANDMARK; break; case LLAssetType::AT_SCRIPT: case LLAssetType::AT_LSL_TEXT: 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> |