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

Merge branch 'master' of https://github.com/siana/SingularityViewer

Browse Source 
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
This commit is contained in:
Aleric Inglewood
2011-05-13 23:55:06 +02:00
parent ea2cc3e0de ea31271ac1
commit 41f13dbf46
36 changed files with 647 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,23 @@
<string>settings_rlv.xml</string>
</array>
<key>FloaterAvatarTextRect</key>
<map>
<key>Comment</key>
<string>Avatar texture floater position</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
</array>
</map>
<key>SianaLegacyJ2CSize</key>
<map>
<key>Comment</key>
@@ -12967,7 +12984,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>UseOutfitFolders</key>
<map>

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

@@ -673,5 +673,100 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>KeywordsChangeColor</key>
<map>
<key>Comment</key>
<string>change message color if keyword found</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>KeywordsColor</key>
<map>
<key>Comment</key>
<string>Color of keyword detects messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>1.0</real>
<real>0.600000023842</real>
<real>0.0</real>
<real>1.0</real>
</array>
</map>
<key>KeywordsInChat</key>
<map>
<key>Comment</key>
<string>Look for keywords in local chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>KeywordsInIM</key>
<map>
<key>Comment</key>
<string>Look for keywords in group instant messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>KeywordsList</key>
<map>
<key>Comment</key>
<string>Comma seperated key words to search for</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>KeywordsOn</key>
<map>
<key>Comment</key>
<string>Look for keywords</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>KeywordsPlaySound</key>
<map>
<key>Comment</key>
<string>Play a sound if keyword found</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>KeywordsSound</key>
<map>
<key>Comment</key>
<string>The sound to play if a keyword is found</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
</map>
</llsd>

2
indra/newview/app_settings/settings_sh.xml
View File

@@ -111,7 +111,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>SGBlockDialogSpam</key>
<map>