livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of last merge borkasaur. Left off a comma on defining the mesh array. Also switched our mesh icon code to sync with viewer 2 and cleared out extra notification

meow-7.2.2
Palmer 2009-12-08 16:06:18 -08:00
parent 74f2cb2a70
commit 7a7eced4a6
5 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorybridge.cpp
View File

@ -125,9 +125,9 @@ std::string ICON_NAME[ICON_NAME_COUNT] =
"Inv_Gesture",
"Inv_LinkItem",
"Inv_LinkFolder"
"Inv_LinkFolder",
"inv_item_mesh.tga"
"Inv_Mesh"
};
// +=================================================+

2
indra/newview/llviewertexteditor.cpp
View File

@ -534,7 +534,7 @@ LLUIImagePtr LLEmbeddedItems::getItemImage(llwchar ext_char) const
case LLAssetType::AT_BODYPART: img_name = "Inv_Skin"; break;
case LLAssetType::AT_ANIMATION: img_name = "Inv_Animation"; break;
case LLAssetType::AT_GESTURE: img_name = "Inv_Gesture"; break;
case LLAssetType::AT_MESH: img_name = "inv_item_mesh.tga"; break;
case LLAssetType::AT_MESH: img_name = "Inv_Mesh"; break;
default: llassert(0);
}

1
indra/newview/skins/default/textures/textures.xml
View File

@ -233,6 +233,7 @@ with the same filename but different name
<texture name="Inv_LookFolderOpen" file_name="icons/Inv_LookFolderOpen.png" preload="false" />
<texture name="Inv_LookFolderClosed" file_name="icons/Inv_LookFolderClosed.png" preload="false" />
<texture name="Inv_Landmark" file_name="icons/Inv_Landmark.png" preload="false" />
<texture name="Inv_Mesh" file_name="icons/Inv_Mesh.png" preload="false" />
<texture name="Inv_Notecard" file_name="icons/Inv_Notecard.png" preload="false" />
<texture name="Inv_Object" file_name="icons/Inv_Object.png" preload="false" />
<texture name="Inv_Pants" file_name="icons/Inv_Pants.png" preload="false" />

29
indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
View File

@ -102,6 +102,23 @@
name="icon_notecard"
top="122"
width="16" />
<check_box
height="16"
label="Meshes"
layout="topleft"
left_pad="2"
name="check_mesh"
top_delta="0"
width="126" />
<icon
height="16"
image_name="Inv_Mesh"
layout="topleft"
left="8"
mouse_opaque="true"
name="icon_mesh"
top="142"
width="16" />
<check_box
height="16"
label="Notecards"
@ -117,7 +134,7 @@
left="8"
mouse_opaque="true"
name="icon_object"
top="142"
top="162"
width="16" />
<check_box
height="16"
@ -134,7 +151,7 @@
left="8"
mouse_opaque="true"
name="icon_script"
top="162"
top="182"
width="16" />
<check_box
height="16"
@ -151,7 +168,7 @@
left="8"
mouse_opaque="true"
name="icon_sound"
top="182"
top="202"
width="16" />
<check_box
height="16"
@ -168,7 +185,7 @@
left="8"
mouse_opaque="true"
name="icon_texture"
top="202"
top="222"
width="16" />
<check_box
height="16"
@ -185,7 +202,7 @@
left="8"
mouse_opaque="true"
name="icon_snapshot"
top="222"
top="242"
width="16" />
<check_box
height="16"
@ -203,7 +220,7 @@
layout="topleft"
left="8"
name="All"
top="242"
top="262"
width="100" />
<button
follows="left|top"

21
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5803,22 +5803,11 @@ Your voice has been muted by moderator.
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmClearTeleportHistory"
type="alertmodal">
Are you sure you want to delete your teleport history?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="UploadCostConfirmation"
type="alertmodal">
<notification
icon="alertmodal.tga"
name="UploadCostConfirmation"
type="alertmodal">
This upload will cost L$[PRICE], do you wish to continue with the upload?
<usetemplate
name="okcancelbuttons"