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

Zeus has been begging for this

Browse Source
This commit is contained in:
Siana Gearz
2011-07-11 12:05:53 +02:00
parent 62780b0787
commit 379f4c63ec
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,18 @@
<string>settings_sh.xml</string> <string>settings_sh.xml</string>
<string>settings_rlv.xml</string> <string>settings_rlv.xml</string>
</array> </array>
<key>CCSAllowNameplateOverride</key>
<map>
<key>Comment</key>
<string>Allow CCS HUD to override nameplates.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>HTTPRequestRate</key> <key>HTTPRequestRate</key>
<map> <map>

19
indra/newview/llvoavatar.cpp
View File

@@ -3523,9 +3523,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
} }
// check attachments for nameplate override // check attachments for nameplate override
static const LLCachedControl<bool> allow_nameplate_override ("CCSAllowNameplateOverride", true);
std::string nameplate; std::string nameplate;
attachment_map_t::iterator it, end=mAttachmentPoints.end(); attachment_map_t::iterator it, end=mAttachmentPoints.end();
for (it=mAttachmentPoints.begin(); it!=end; ++it) { if (allow_nameplate_override) for (it=mAttachmentPoints.begin(); it!=end; ++it) {
// get attached object // get attached object
LLViewerJointAttachment *atm = it->second; LLViewerJointAttachment *atm = it->second;
if (!atm) continue; if (!atm) continue;
@@ -8417,6 +8418,22 @@ void LLVOAvatar::setCompositeUpdatesEnabled( BOOL b )
} }
} }
void LLVOAvatar::setNameFromChat(const std::string &text) {
static const LLCachedControl<bool> allow_nameplate_override ("CCSAllowNameplateOverride", true);
if(allow_nameplate_override) {
mNameFromChatOverride = true;
mNameFromChatChanged = true;
mNameFromChatText = text;
}
}
void LLVOAvatar::clearNameFromChat() {
mNameFromChatOverride = false;
mNameFromChatChanged = true;
mNameFromChatText = "";
}
void LLVOAvatar::addChat(const LLChat& chat) void LLVOAvatar::addChat(const LLChat& chat)
{ {
std::deque<LLChat>::iterator chat_iter; std::deque<LLChat>::iterator chat_iter;

4
indra/newview/llvoavatar.h
View File

@@ -559,8 +559,8 @@ public:
void setCompositeUpdatesEnabled(BOOL b); void setCompositeUpdatesEnabled(BOOL b);
void setNameFromChat(const std::string &text) { mNameFromChatOverride = mNameFromChatChanged = true; mNameFromChatText = text; } void setNameFromChat(const std::string &text);
void clearNameFromChat() { mNameFromChatOverride = false; mNameFromChatChanged = true; mNameFromChatText = ""; } void clearNameFromChat();
public: public: