Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
This commit is contained in:
Shyotl
2012-02-24 13:21:59 -06:00
parent 5c66c70546 0bdf54e6d9
commit a6a69caa4f
177 changed files with 9551 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -7045,5 +7045,18 @@ Click 'Wear' to attach the Physics Wearable, or click 'Cancel' if you wish to ma
</form>
</notification>
<notification
icon="alert.tga"
name="SGIncompleteAppearence"
type="alert">
Sending incomplete appearence. You may appear to others as a cloud.
Your shape, skin, hair or eyes might be defect.
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
</notifications>