livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make viewer tag display optional, add to general preferences, clean up excessive client tag logging.

meow-7.2.2
Arrehn 2011-04-14 03:00:38 -04:00
parent f65d36e239
commit 4d586e85b8
3 changed files with 90 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,53 +3,65 @@
xsi:noNamespaceSchemaLocation="llsd.xsd">
<map>
<key>PhoenixOOCPrefix</key>
<map>
<key>Comment</key>
<string>Prefix to mark OOC chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>((</string>
</map>
<key>PhoenixOOCPostfix</key>
<map>
<key>Comment</key>
<string>Postfix to mark OOC chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>))</string>
</map>
<key>ShowViewerIDsOnNameTag</key>
<map>
<key>Comment</key>
<string>Show viewer identification when display hovertext names over avatars</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<string>1</string>
</map>
<key>PhoenixOOCPrefix</key>
<map>
<key>Comment</key>
<string>Prefix to mark OOC chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>((</string>
</map>
<key>PhoenixOOCPostfix</key>
<map>
<key>Comment</key>
<string>Postfix to mark OOC chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>))</string>
</map>
<key>PhoenixPlayChatAnimation</key>
<map>
<key>Comment</key>
<string>Play the avatar chat animations, e.g. shouting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<string>1</string>
</map>
<map>
<key>Comment</key>
<string>Play the avatar chat animations, e.g. shouting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<string>1</string>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RadarReportChatRange</key>
<map>

11
indra/newview/llvoavatar.cpp
View File

@ -3012,9 +3012,8 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// Might be blank if name not available yet, that's OK
if (show_display_names)
{
if (!mClientTag.empty())
if (!mClientTag.empty() && gSavedSettings.getBOOL("ShowViewerIDsOnNameTag"))
{
lldebugs << "ClientTag is set! mClientTag=" << mClientTag << llendl;
LLColor4 name_tag_color = getNameTagColor(is_friend); // could be modified later
addNameTagLine(av_name.mDisplayName+" (" + mClientTag + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif());
}
@ -3057,7 +3056,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// [/RLVa:KB]
else // Only check for client tags when not RLV anon -AO
{
if (!mClientTag.empty())
if (!mClientTag.empty() && gSavedSettings.getBOOL("ShowViewerIDsOnNameTag"))
{
lldebugs << "ClientTag is set! mClientTag=" << mClientTag << llendl;
LLColor4 name_tag_color = getNameTagColor(is_friend); // could be modified later
@ -7054,13 +7053,11 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
// <clientTags>
LLTextureEntry* tex = getTE(0);
const LLUUID tag_uuid = tex->getID();
llinfos << "LLVOAvatar::processAvatarAppearance() Checking Texture " << tex->getID() << llendl;
resolveClient(tag_uuid); // sets mClientTag
if (mClientTag != "")
{
llinfos << "LLVOAvatar::processAvatarAppearance() Detected ClientTag=" << mClientTag << llendl;
//llinfos << "LLVOAvatar::processAvatarAppearance() Detected ClientTag=" << mClientTag << llendl;
mNameString.clear();
}
else if(tex->getGlow() > 0.0f)
@ -7069,7 +7066,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
U32 tag_len = strnlen((const char*)&tag_uuid.mData[0], UUID_BYTES);
mClientTag = std::string((const char*)&tag_uuid.mData[0], tag_len);
LLStringFn::replace_ascii_controlchars(mClientTag, LL_UNKNOWN_CHAR);
llinfos << "LLVOAvatar::processAvatarAppearance() Detected ClientTag=" << mClientTag << llendl;
//llinfos << "LLVOAvatar::processAvatarAppearance() Detected ClientTag=" << mClientTag << llendl;
mNameString.clear();
}
else

52
indra/newview/skins/default/xui/en/panel_preferences_general.xml
View File

@ -275,27 +275,28 @@
name="show_slids"
tool_tip="Show username, like bobsmith123"
top_delta="0" />
<check_box
control_name="NameTagShowGroupTitles"
enabled_control="AvatarNameTagMode"
height="16"
label="Group titles"
layout="topleft"
left="35"
width="100"
name="show_all_title_checkbox1"
tool_tip="Show group titles, like Officer or Member"
top_pad="3" />
<check_box
control_name="NameTagShowFriends"
enabled_control="AvatarNameTagMode"
height="16"
label="Highlight friends"
layout="topleft"
left_pad="50"
name="show_friends"
tool_tip="Highlight the name tags of your friends" />
<check_box
control_name="NameTagShowGroupTitles"
enabled_control="AvatarNameTagMode"
height="16"
label="Group titles"
layout="topleft"
left="35"
width="100"
name="show_all_title_checkbox1"
tool_tip="Show group titles, like Officer or Member"
top_pad="3" />
<check_box
control_name="NameTagShowFriends"
enabled_control="AvatarNameTagMode"
height="16"
label="Highlight friends"
layout="topleft"
left_pad="50"
name="show_friends"
tool_tip="Highlight the name tags of your friends" />
<check_box
control_name="UseDisplayNames"
@ -305,10 +306,19 @@
layout="topleft"
left="35"
name="display_names_check"
width="237"
width="100"
tool_tip="Check to use display names in chat, IM, name tags, etc."
top_pad="3"/>
<check_box
control_name="ShowViewerIDsOnNameTag"
height="16"
label="Show Viewer ID"
layout="topleft"
left_pad="50"
name="show_viewerID"
tool_tip="Shows the name of the avatar's detected viewer next to their name (delayed effect)" />
<check_box
control_name="EnableUIHints"
follows="top|left"