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

Merge remote-tracking branch 'slb/master'

Browse Source 
Conflicts:
	indra/newview/llnetmap.cpp
	indra/newview/llnetmap.h
	indra/newview/skins/default/xui/en-us/menu_mini_map.xml
This commit is contained in:
Aleric Inglewood
2013-09-29 16:56:55 +02:00
parent ffc44a7010 af1480615f
commit 227c621dad
8 changed files with 253 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
indra/newview/app_settings/settings.xml
View File

@@ -10068,6 +10068,98 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>MiniMapChatRings</key>
<map>
<key>Comment</key>
<string>Display chat distance rings on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MiniMapWhisperRing</key>
<map>
<key>Comment</key>
<string>Display whisper distance ring on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MiniMapWhisperRingColor</key>
<map>
<key>Comment</key>
<string>Color for whisper distance ring on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>1.0</real>
<real>0.0</real>
<real>0.5</real>
</array>
</map>
<key>MiniMapChatRing</key>
<map>
<key>Comment</key>
<string>Display chat distance ring on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MiniMapChatRingColor</key>
<map>
<key>Comment</key>
<string>Color for chat distance ring on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>1.0</real>
<real>0.0</real>
<real>0.5</real>
</array>
</map>
<key>MiniMapShoutRing</key>
<map>
<key>Comment</key>
<string>Display shout distance ring on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MiniMapShoutRingColor</key>
<map>
<key>Comment</key>
<string>Color for shout distance ring on mini map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>0.0</real>
<real>0.0</real>
<real>0.5</real>
</array>
</map>
<key>MiniMapScale</key>
<map>
<key>Comment</key>