RLVa fixes
This commit is contained in:
Siana Gearz
File diff suppressed because it is too large
Load Diff
@@ -1,188 +1,190 @@
|
||||
<?xml version="1.0"?>
|
||||
<llsd>
|
||||
<map>
|
||||
<key>RLVaLoginLastLocation</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Determines whether the next login will be forced to the last logoff location (set by the viewer)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>BusyModeResponse</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Auto response to instant messages while in busy mode.</string>
|
||||
<key>AO.Settings</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>List for animation overrider</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>LLSD</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<string />
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentContactGroups</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>List for contact groups</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>LLSD</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<string />
|
||||
</array>
|
||||
</map>
|
||||
<key>Responder.Settings</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>New organization to the Auto-Respond settings for keeping clean</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>LLSD</string>
|
||||
<key>Value</key>
|
||||
<map>
|
||||
<key>Message</key>
|
||||
<string>This is an autoresponse!</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>AscentInstantMessageAnnounceIncoming</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Open a new IM tab when another person begins typing to you and announce that they are doing so.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</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>
|
||||
<key>AscentInstantMessageResponse</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Auto response to instant messages</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>This is an autoresponse!</string>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseAnyone</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to auto-respond to anyone</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseFriends</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to auto-respond to non-friends</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseItem</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to send a item along with the autoresponse</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseItemData</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>UUID</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string></string>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseMuted</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to auto-respond to muted people</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseRepeat</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to keep on resending the autoresponse every line they send</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageShowOnTyping</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to perform the autorespond the moment they begin to type instead of waiting for a actual message</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageShowResponded</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to hide IMs entirely from those you have chosen to send autoresponses</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<!-- Ascent Account-Specific (If active) -->
|
||||
<key>AscentFriendColor</key>
|
||||
<key>RLVaLoginLastLocation</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Determines whether the next login will be forced to the last logoff location (set by the viewer)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>BusyModeResponse</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Auto response to instant messages while in busy mode.</string>
|
||||
</map>
|
||||
<key>AO.Settings</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>List for animation overrider</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>LLSD</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<string/>
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentContactGroups</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>List for contact groups</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>LLSD</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<string/>
|
||||
</array>
|
||||
</map>
|
||||
<key>Responder.Settings</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>New organization to the Auto-Respond settings for keeping clean</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>LLSD</string>
|
||||
<key>Value</key>
|
||||
<map>
|
||||
<key>Message</key>
|
||||
<string>This is an autoresponse!</string>
|
||||
</map>
|
||||
</map>
|
||||
<key>AscentInstantMessageAnnounceIncoming</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Open a new IM tab when another person begins typing to you and announce that they are doing so.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</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>
|
||||
<key>AscentInstantMessageResponse</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Auto response to instant messages</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>This is an autoresponse!</string>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseAnyone</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to auto-respond to anyone</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseFriends</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to auto-respond to non-friends</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseItem</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to send a item along with the autoresponse</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseItemData</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>UUID</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string/>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseMuted</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to auto-respond to muted people</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageResponseRepeat</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to keep on resending the autoresponse every line they send</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageShowOnTyping</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to perform the autorespond the moment they begin to type instead of waiting for a actual message</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentInstantMessageShowResponded</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether to hide IMs entirely from those you have chosen to send autoresponses</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<!-- Ascent Account-Specific (If active) -->
|
||||
<key>AscentFriendColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from other residents</string>
|
||||
@@ -198,7 +200,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentLindenColor</key>
|
||||
<key>AscentLindenColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from other residents</string>
|
||||
@@ -214,7 +216,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentMutedColor</key>
|
||||
<key>AscentMutedColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from other residents</string>
|
||||
@@ -230,7 +232,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentEstateOwnerColor</key>
|
||||
<key>AscentEstateOwnerColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from other residents</string>
|
||||
@@ -246,18 +248,18 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentUseCustomTag</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Show a custom local tag.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentCustomTagColor</key>
|
||||
<key>AscentUseCustomTag</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Show a custom local tag.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AscentCustomTagColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of custom local tag.</string>
|
||||
@@ -273,18 +275,18 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>AscentCustomTagLabel</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Label for the custom local tag</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>Custom</string>
|
||||
</map>
|
||||
<key>AscentReportClientIndex</key>
|
||||
<key>AscentCustomTagLabel</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Label for the custom local tag</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>Custom</string>
|
||||
</map>
|
||||
<key>AscentReportClientIndex</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Show your own tag</string>
|
||||
@@ -295,7 +297,7 @@
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>AscentReportClientUUID</key>
|
||||
<key>AscentReportClientUUID</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Broadcasted Client Key</string>
|
||||
@@ -306,43 +308,43 @@
|
||||
<key>Value</key>
|
||||
<string>8873757c-092a-98fb-1afd-ecd347566fcd</string>
|
||||
</map>
|
||||
<!-- Ascent Account-Specific (Always) -->
|
||||
<!-- General additions -->
|
||||
<key>rkeastInventoryPreviousCount</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Used to keep track of the number of items in inventory when fetching for progress reasons. DO NOT EDIT.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>S32</string>
|
||||
<key>Value</key>
|
||||
<integer>-1</integer>
|
||||
</map>
|
||||
<key>rkeastInventorySearchType</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Controls what type of inventory search we perform.</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>rkeastInventoryPartialSearch</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Toggles whether to search using partial search filters on normal (name, desc, creator) searches.</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<!-- Standard options now with Account-specific (if active) handling -->
|
||||
<key>AgentChatColor</key>
|
||||
<!-- Ascent Account-Specific (Always) -->
|
||||
<!-- General additions -->
|
||||
<key>rkeastInventoryPreviousCount</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Used to keep track of the number of items in inventory when fetching for progress reasons. DO NOT EDIT.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>S32</string>
|
||||
<key>Value</key>
|
||||
<integer>-1</integer>
|
||||
</map>
|
||||
<key>rkeastInventorySearchType</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Controls what type of inventory search we perform.</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>rkeastInventoryPartialSearch</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Toggles whether to search using partial search filters on normal (name, desc, creator) searches.</string>
|
||||
<key>Persist</key>
|
||||
<integer>0</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<!-- Standard options now with Account-specific (if active) handling -->
|
||||
<key>AgentChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from other residents</string>
|
||||
@@ -358,7 +360,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>BackgroundChatColor</key>
|
||||
<key>BackgroundChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat bubble background</string>
|
||||
@@ -374,7 +376,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>EffectColor</key>
|
||||
<key>EffectColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Particle effects color</string>
|
||||
@@ -390,7 +392,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>IMChatColor</key>
|
||||
<key>IMChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of instant messages from other residents</string>
|
||||
@@ -406,7 +408,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>llOwnerSayChatColor</key>
|
||||
<key>llOwnerSayChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from objects only visible to the owner</string>
|
||||
@@ -422,7 +424,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>ObjectChatColor</key>
|
||||
<key>ObjectChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from objects</string>
|
||||
@@ -432,13 +434,13 @@
|
||||
<string>Color4</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<real>0.699999988079</real>
|
||||
<real>0.899999976158</real>
|
||||
<real>0.699999988079</real>
|
||||
<real>1</real>
|
||||
<real>0.699999988079</real>
|
||||
<real>0.899999976158</real>
|
||||
<real>0.699999988079</real>
|
||||
<real>1</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>SkinCurrent</key>
|
||||
<key>SkinCurrent</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>The currently selected skin.</string>
|
||||
@@ -449,7 +451,7 @@
|
||||
<key>Value</key>
|
||||
<string>default</string>
|
||||
</map>
|
||||
<key>SystemChatColor</key>
|
||||
<key>SystemChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of chat messages from SL System</string>
|
||||
@@ -465,7 +467,7 @@
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>UISndAlert</key>
|
||||
<key>UISndAlert</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Sound file for alerts (uuid for sound asset)</string>
|
||||
@@ -828,131 +830,131 @@
|
||||
<key>Value</key>
|
||||
<string>c80260ba-41fd-8a46-768a-6bf236360e3a</string>
|
||||
</map>
|
||||
<key>UserChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of your chat messages</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>1.0</real>
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>BusyModeResponse</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Auto response to instant messages while in busy mode.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
|
||||
</map>
|
||||
<key>IMLogTimestamp</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Timestamp of Instant Messages</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>InstantMessageLogPath</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Path to your log files.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string />
|
||||
</map>
|
||||
<key>LastLogoff</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Last logoff</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogChat</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Chat</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogChatIM</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Incoming Instant Messages with Chat</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogChatTimestamp</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Timestamp of Chat</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogInstantMessages</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Instant Messages</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>LogShowHistory</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Show History</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>LogTimestampDate</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Include Date with Timestamp</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>UserChatColor</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Color of your chat messages</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>1.0</real>
|
||||
<real>1.0</real>
|
||||
</array>
|
||||
</map>
|
||||
<key>BusyModeResponse</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Auto response to instant messages while in busy mode.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string>The Resident you messaged is in 'busy mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.</string>
|
||||
</map>
|
||||
<key>IMLogTimestamp</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Timestamp of Instant Messages</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>InstantMessageLogPath</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Path to your log files.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>String</string>
|
||||
<key>Value</key>
|
||||
<string/>
|
||||
</map>
|
||||
<key>LastLogoff</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Last logoff</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>U32</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogChat</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Chat</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogChatIM</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Incoming Instant Messages with Chat</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogChatTimestamp</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Timestamp of Chat</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>LogInstantMessages</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Instant Messages</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>LogShowHistory</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Log Show History</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>LogTimestampDate</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Include Date with Timestamp</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
</map>
|
||||
</llsd>
|
||||
|
||||
@@ -7103,11 +7103,6 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
|
||||
LL_DEBUGS("Wearables") << " fetching " << asset_id_array[i] << LL_ENDL;
|
||||
if( !gAgent.mWearableEntry[i].mItemID.isNull() )
|
||||
{
|
||||
for( i = 0; i < WT_COUNT; i++ )
|
||||
{
|
||||
LL_DEBUGS("Wearables") << " fetching " << asset_id_array[i] << LL_ENDL;
|
||||
if( !gAgent.mWearableEntry[i].mItemID.isNull() )
|
||||
{
|
||||
// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-08-08 (RLVa-1.0.1g) | Added: RLVa-1.0.1g
|
||||
if (rlv_handler_t::isEnabled())
|
||||
rlvItems.push_back(gAgent.mWearableEntry[i].mItemID);
|
||||
@@ -8113,12 +8108,6 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
|
||||
// [RLVa:KB] - Checked: 2009-11-24 (RLVa-1.1.0f) | Modified: RLVa-1.1.0e
|
||||
std::list<U32> LocalIDs;
|
||||
for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); iter != avatarp->mAttachmentPoints.end(); )
|
||||
{
|
||||
LLVOAvatar::attachment_map_t::iterator curiter = iter++;
|
||||
LLViewerJointAttachment* attachment = curiter->second;
|
||||
LLViewerObject* objectp = attachment->getObject();
|
||||
if (objectp)
|
||||
{
|
||||
{
|
||||
LLVOAvatar::attachment_map_t::iterator curiter = iter++;
|
||||
LLViewerJointAttachment* attachment = curiter->second;
|
||||
|
||||
@@ -66,7 +66,6 @@
|
||||
// [RLVa:KB]
|
||||
#include "rlvhandler.h"
|
||||
// [/RLVa:KB]
|
||||
>>>>>>>
|
||||
|
||||
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
// Class LLPropertiesObserver
|
||||
|
||||
@@ -2074,12 +2074,12 @@ void LLFloaterIMPanel::sendMsg()
|
||||
if (IM_NOTHING_SPECIAL == mDialog) // One-on-one IM: allow if recipient is a sendim exception
|
||||
{
|
||||
if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mOtherParticipantUUID))
|
||||
utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
utf8text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
}
|
||||
else if (gAgent.isInGroup(mSessionUUID)) // Group chat: allow if recipient is a sendim exception
|
||||
{
|
||||
if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mSessionUUID))
|
||||
utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
utf8text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
}
|
||||
else if (mSpeakers) // Conference chat: allow if all participants are sendim exceptions
|
||||
{
|
||||
@@ -2092,14 +2092,14 @@ void LLFloaterIMPanel::sendMsg()
|
||||
LLSpeaker* pSpeaker = *itSpeaker;
|
||||
if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.isException(RLV_BHVR_SENDIM, pSpeaker->mID)) )
|
||||
{
|
||||
utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
utf8text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
else // Catch all fall-through
|
||||
{
|
||||
utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
utf8text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
|
||||
}
|
||||
}
|
||||
// [/RLVa:KB]
|
||||
|
||||
@@ -4343,34 +4343,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
class LLWearAttachmentsCallback : public LLInventoryCallback
|
||||
{
|
||||
public:
|
||||
LLWearAttachmentsCallback(bool append) : mAppend(append) {}
|
||||
void fire(const LLUUID& item_id)
|
||||
{
|
||||
mItemIDs.insert(item_id);
|
||||
}
|
||||
protected:
|
||||
~LLWearAttachmentsCallback()
|
||||
{
|
||||
if( LLInventoryCallbackManager::is_instantiated() )
|
||||
{
|
||||
wear_attachments_on_avatar(mItemIDs, mAppend);
|
||||
}
|
||||
else
|
||||
{
|
||||
llwarns << "Dropping unhandled LLWearAttachmentsCallback" << llendl;
|
||||
}
|
||||
}
|
||||
private:
|
||||
std::set<LLUUID> mItemIDs;
|
||||
bool mAppend;
|
||||
};
|
||||
|
||||
|
||||
|
||||
class LLWearInventoryCategoryCallback : public LLInventoryCallback;
|
||||
class LLWearInventoryCategoryCallback : public LLInventoryCallback
|
||||
{
|
||||
public:
|
||||
LLWearInventoryCategoryCallback(const LLUUID& cat_id, bool append)
|
||||
@@ -4411,6 +4384,30 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class LLWearAttachmentsCallback : public LLInventoryCallback
|
||||
{
|
||||
public:
|
||||
LLWearAttachmentsCallback(bool append) : mAppend(append) {}
|
||||
void fire(const LLUUID& item_id)
|
||||
{
|
||||
mItemIDs.insert(item_id);
|
||||
}
|
||||
protected:
|
||||
~LLWearAttachmentsCallback()
|
||||
{
|
||||
if( LLInventoryCallbackManager::is_instantiated() )
|
||||
{
|
||||
wear_attachments_on_avatar(mItemIDs, mAppend);
|
||||
}
|
||||
else
|
||||
{
|
||||
llwarns << "Dropping unhandled LLWearAttachmentsCallback" << llendl;
|
||||
}
|
||||
}
|
||||
private:
|
||||
std::set<LLUUID> mItemIDs;
|
||||
bool mAppend;
|
||||
};
|
||||
|
||||
|
||||
void LLOutfitObserver::done()
|
||||
|
||||
@@ -81,10 +81,6 @@
|
||||
#include "rlvhandler.h"
|
||||
// [/RLVa:KB]
|
||||
|
||||
#define USE_VIEWER_AUTH 0
|
||||
|
||||
const S32 BLACK_BORDER_HEIGHT = 160;
|
||||
|
||||
// <edit>
|
||||
#include "llappviewer.h"
|
||||
#include "llspinctrl.h"
|
||||
|
||||
@@ -3455,30 +3455,6 @@ void LLSelectMgr::convertTransient()
|
||||
}
|
||||
|
||||
|
||||
void LLSelectMgr::deselectUnused()
|
||||
{
|
||||
// no more outstanding references to this selection
|
||||
|
||||
// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
|
||||
#ifdef RLV_EXTENSION_CMD_INTERACT
|
||||
// [Fall-back code] Don't allow an active selection (except for HUD attachments - see above) when @interact=n restricted
|
||||
if (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))
|
||||
{
|
||||
deselectAll();
|
||||
return;
|
||||
}
|
||||
#endif // RLV_EXTENSION_CMD_INTERACT
|
||||
// [/RLVa:KB]
|
||||
|
||||
// HACK: Don't deselect when we're navigating to rate an object's
|
||||
// owner or creator. JC
|
||||
if (gPieObject->getVisible() || gPieRate->getVisible() )
|
||||
if (mSelectedObjects->getNumRefs() == 1)
|
||||
{
|
||||
deselectAll();
|
||||
}
|
||||
}
|
||||
|
||||
void LLSelectMgr::deselectAllIfTooFar()
|
||||
{
|
||||
if (mSelectedObjects->isEmpty() || mSelectedObjects->mSelectType == SELECT_TYPE_HUD)
|
||||
|
||||
@@ -1877,7 +1877,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
|
||||
{
|
||||
prepend_msg = std::string("IM: ");
|
||||
}
|
||||
chat.mText = prepend_msg + name + separator_string + saved + message.substr(message_offset);
|
||||
chat.mText = prepend_msg + name + separator_string + message.substr(message_offset);
|
||||
LLFloaterChat::addChat( chat, TRUE, TRUE );
|
||||
}
|
||||
else if (from_id.isNull())
|
||||
|
||||
@@ -3466,6 +3466,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
{
|
||||
// update chat bubble
|
||||
@@ -3482,7 +3483,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
static LLCachedControl<F32> FADE_DURATION("RenderNameFadeDuration",1); // seconds
|
||||
static LLCachedControl<bool> use_chat_bubbles("UseChatBubbles",false);
|
||||
static LLCachedControl<bool> render_name_hide_self("RenderNameHideSelf",false);
|
||||
const F32 time_visible = mTimeVisible.getElapsedTimeF32();
|
||||
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
|
||||
bool fRlvShowNames = gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES);
|
||||
// [/RLVa:KB]
|
||||
@@ -3490,9 +3490,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
BOOL visible_chat = use_chat_bubbles && (mChats.size() || mTyping);
|
||||
BOOL render_name = visible_chat ||
|
||||
(visible_avatar &&
|
||||
// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.0h
|
||||
( (!fRlvShowNames) || (RlvSettings::getShowNameTags()) ) &&
|
||||
// [/RLVa:KB]
|
||||
((sRenderName == RENDER_NAME_ALWAYS) ||
|
||||
(sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
|
||||
// If it's your own avatar, don't draw in mouselook, and don't
|
||||
@@ -3530,13 +3527,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
new_name = TRUE;
|
||||
}
|
||||
|
||||
LLNameValue *title = getNVPair("Title");
|
||||
LLNameValue* firstname = getNVPair("FirstName");
|
||||
LLNameValue* lastname = getNVPair("LastName");
|
||||
|
||||
// <edit>
|
||||
std::string client;
|
||||
// </edit>
|
||||
|
||||
// First Calculate Alpha
|
||||
// If alpha > 0, create mNameText if necessary, otherwise delete it
|
||||
{
|
||||
@@ -3562,9 +3554,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
|
||||
if (alpha > 0.f)
|
||||
{
|
||||
std::string line;
|
||||
// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
|
||||
if (!fRlvShowNames)
|
||||
if (!mNameText)
|
||||
{
|
||||
mNameText = (LLHUDText *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_TEXT);
|
||||
mNameText->setMass(10.f);
|
||||
@@ -3579,6 +3569,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
}
|
||||
|
||||
LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
|
||||
|
||||
//As pointed out by Zwagoth, we really shouldn't be doing this per-frame. Skip if we already have the data. -HgB
|
||||
if (mClientTag == "")
|
||||
{
|
||||
@@ -3660,15 +3651,11 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
if ((mIsSelf && gSavedSettings.getBOOL("AscentShowSelfTagColor"))
|
||||
|| (!mIsSelf && gSavedSettings.getBOOL("AscentShowOthersTagColor")))
|
||||
avatar_name_color = mClientColor;
|
||||
|
||||
|
||||
|
||||
avatar_name_color.setAlpha(alpha);
|
||||
|
||||
//llinfos << "Show Self Tag is set to " << gSavedSettings.getBOOL("AscentShowSelfTagColor") << llendl;
|
||||
|
||||
mNameText->setColor(avatar_name_color);
|
||||
|
||||
|
||||
LLQuaternion root_rot = mRoot.getWorldRotation();
|
||||
mNameText->setUsePixelSize(TRUE);
|
||||
LLVector3 pixel_right_vec;
|
||||
@@ -3698,15 +3685,17 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
LLNameValue *title = getNVPair("Title");
|
||||
LLNameValue* firstname = getNVPair("FirstName");
|
||||
LLNameValue* lastname = getNVPair("LastName");
|
||||
|
||||
if (mNameText.notNull() && firstname && lastname)
|
||||
{
|
||||
BOOL is_away = mSignaledAnimations.find(ANIM_AGENT_AWAY) != mSignaledAnimations.end();
|
||||
BOOL is_away = mSignaledAnimations.find(ANIM_AGENT_AWAY) != mSignaledAnimations.end();
|
||||
if(mNameAway && ! is_away) mIdleTimer.reset();
|
||||
BOOL is_busy = mSignaledAnimations.find(ANIM_AGENT_BUSY) != mSignaledAnimations.end();
|
||||
if(mNameBusy && ! is_busy) mIdleTimer.reset();
|
||||
BOOL is_appearance = mSignaledAnimations.find(ANIM_AGENT_CUSTOMIZE) != mSignaledAnimations.end();
|
||||
BOOL is_appearance = mSignaledAnimations.find(ANIM_AGENT_CUSTOMIZE) != mSignaledAnimations.end();
|
||||
if(mNameAppearance && ! is_appearance) mIdleTimer.reset();
|
||||
BOOL is_muted;
|
||||
if (mIsSelf)
|
||||
@@ -3716,7 +3705,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
else
|
||||
{
|
||||
is_muted = LLMuteList::getInstance()->isMuted(getID());
|
||||
|
||||
}
|
||||
|
||||
if (mNameString.empty() ||
|
||||
@@ -3725,14 +3713,12 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
(title && mTitle != title->getString()) ||
|
||||
(is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute)
|
||||
|| is_appearance != mNameAppearance
|
||||
|| client.length() ) // <edit>
|
||||
|| client.length() ) // <edit/>
|
||||
{
|
||||
std::string line;
|
||||
|
||||
|
||||
|
||||
|
||||
if (!sRenderGroupTitles)
|
||||
// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
|
||||
if (!fRlvShowNames)
|
||||
{
|
||||
// [/RLVa:KB]
|
||||
if (!sRenderGroupTitles)
|
||||
@@ -3763,9 +3749,9 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
line = RlvStrings::getAnonym(line.assign(firstname->getString()).append(" ").append(lastname->getString()));
|
||||
}
|
||||
// [/RLVa:KB]
|
||||
BOOL need_comma = FALSE;
|
||||
|
||||
std::string additions;
|
||||
BOOL need_comma = FALSE;
|
||||
|
||||
if (client.length() || is_away || is_muted || is_busy)
|
||||
{
|
||||
@@ -3938,40 +3924,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void LLVOAvatar::idleUpdateTractorBeam()
|
||||
{
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
@@ -237,7 +237,9 @@ const std::string& RlvStrings::getAnonym(const std::string& strName)
|
||||
// Test with 11,264 SL names showed a 3.33% - 3.82% occurance for each so we *should* get a very even spread
|
||||
for (int idx = 0, cnt = strName.length(); idx < cnt; idx++)
|
||||
nHash += pszName[idx];
|
||||
|
||||
|
||||
static const std::string empty = "";
|
||||
if (m_Anonyms.size() == 0) return empty;
|
||||
return m_Anonyms[nHash % m_Anonyms.size()];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user