diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index bcf20fb74..709063fe4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1,353 +1,349 @@
-
+
-
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 5cf96ecce..dcbd5bc30 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -1,188 +1,190 @@
+
-
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 840d9ec8e..5c4b31b0a 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -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 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;
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 9c4760511..b0ba5bbad 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -66,7 +66,6 @@
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
->>>>>>>
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLPropertiesObserver
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 20833dab6..5c0e396d3 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -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]
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 7211b132b..f9cb46166 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -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 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 mItemIDs;
+ bool mAppend;
+};
void LLOutfitObserver::done()
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 1230e4da1..e4aec1330 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -81,10 +81,6 @@
#include "rlvhandler.h"
// [/RLVa:KB]
-#define USE_VIEWER_AUTH 0
-
-const S32 BLACK_BORDER_HEIGHT = 160;
-
//
#include "llappviewer.h"
#include "llspinctrl.h"
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 888653c3c..19b3fde46 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -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)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5c21cd602..9e251fc2d 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -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())
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ef34d361d..269f5c3b3 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -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 FADE_DURATION("RenderNameFadeDuration",1); // seconds
static LLCachedControl use_chat_bubbles("UseChatBubbles",false);
static LLCachedControl 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");
-
- //
std::string client;
- //
+
// 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() ) //
+ || client.length() ) //
{
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()
{
//--------------------------------------------------------------------
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 0c04caa5b..d3f4e84ea 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -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()];
}