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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source 
Conflicts:
	indra/llappearance/llavatarappearance.cpp
	indra/newview/character/avatar_lad.xml
	indra/newview/llagent.cpp
This commit is contained in:
Latif Khalifa
2013-03-26 23:54:36 +01:00
parent 779f697ffb 441b564afe
commit 303840f729
36 changed files with 657 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -3981,6 +3981,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="inventory_item_offered-im">
Inventory item offered
</string>
<string name="inventory_item_offered_rlv">
Inventory item offered to [NAME]
</string>
<string name="only_user_message">