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

Merge remote-tracking branch 'singu/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2013-01-07 17:58:53 +01:00
parent a9a308e5e9 cd27184332
commit 4b592f7507
14 changed files with 156 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/app_settings/settings_ascent_coa.xml
View File

@@ -31,7 +31,7 @@
<integer>1</integer>
</map>
<key>MoyMiniMapCustomColor</key>
<key>MoyMiniMapCustomColor</key>
<map>
<key>Comment</key>
<string>Custom minimap color you wish to have.</string>
@@ -256,6 +256,20 @@
<key>IsCOA</key>
<integer>1</integer>
</map>
<!--TODO: implement this and make MoyMiniMapCustomColor more flexible
<key>ColorCustomChat</key>
<map>
<key>Comment</key>
<string>Color chat from users you have chosen using MoyMiniMapCustomColor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map-->
<key>AscentReportClientUUID</key>
<map>
<key>Comment</key>

16
indra/newview/app_settings/settings_per_account.xml
View File

@@ -357,22 +357,6 @@
<string>This is an autoresponse!</string>
</map>
</map>
<key>MoyMiniMapCustomColor</key>
<map>
<key>Comment</key>
<string>Custom minimap color you wish to have.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.375</real>
<real>1.0</real>
<real>1.0</real>
<real>1.0</real>
</array>
</map>
<!-- Ascent Account-Specific (Always) -->
<!-- General additions -->
<key>rkeastInventoryPreviousCount</key>