Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett

1 files changed, 37 insertions, 21 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3be166e..d2aa3d8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -96,7 +96,7 @@
 #include "hippoLimits.h"// getMaxPrimScale
 
 // [RLVa:KB]
-#include "llstartup.h"
+#include "rlvhandler.h"
 // [/RLVa:KB]
 
 using namespace LLVOAvatarDefines;
@@ -3473,10 +3473,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
         BOOL render_name =      visible_chat ||
                                                 (visible_avatar &&
 // [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.0h
-                                                ( (!fRlvShowNames) || (RlvSettings::fShowNameTags) ) &&
+                                                ( (!fRlvShowNames) || (RlvSettings::getShowNameTags()) ) &&
 // [/RLVa:KB]
                                                 ((sRenderName == RENDER_NAME_ALWAYS) ||
-                                                (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
+                                                 (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
         // If it's your own avatar, don't draw in mouselook, and don't
         // draw if we're specifically hiding our own name.
         if (mIsSelf)
@@ -3506,7 +3506,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                 }
                 else if (sRenderGroupTitles != mRenderGroupTitles)
 // [/RLVa]
-                //if (sRenderGroupTitles != mRenderGroupTitles)
+//              if (sRenderGroupTitles != mRenderGroupTitles)
                 {
                         mRenderGroupTitles = sRenderGroupTitles;
                         new_name = TRUE;
@@ -3662,7 +3662,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 }
                                 else
                                 {
-                                        line = gRlvHandler.getAnonym(line.assign(firstname->getString()).append(" ").append(lastname->getString()));
+                                        line = RlvStrings::getAnonym(line.assign(firstname->getString()).append(" ").append(lastname->getString()));
                                 }
 // [/RLVa:KB]
 
@@ -6746,14 +6746,6 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
         gPipeline.markMoved(mDrawable, TRUE);
         mIsSitting = TRUE;
         LLFloaterAO::ChangeStand();
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
-        #ifdef RLV_EXTENSION_STARTLOCATION
-        if (rlv_handler_t::isEnabled())
-        {
-                RlvSettings::updateLoginLastLocation();
-        }
-        #endif // RLV_EXTENSION_STARTLOCATION
-// [/RLVa:KB]
         mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
         mRoot.setPosition(getPosition());
         mRoot.updateWorldMatrixChildren();
@@ -6762,6 +6754,15 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
 
         if (mIsSelf)
         {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+                #ifdef RLV_EXTENSION_STARTLOCATION
+                if (rlv_handler_t::isEnabled())
+                {
+                        RlvSettings::updateLoginLastLocation();
+                }
+                #endif // RLV_EXTENSION_STARTLOCATION
+// [/RLVa:KB]
+
                 // Might be first sit
                 LLFirstUse::useSit();
 
@@ -6815,14 +6816,6 @@ void LLVOAvatar::getOffObject()
         gPipeline.markMoved(mDrawable, TRUE);
 
         mIsSitting = FALSE;
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
-        #ifdef RLV_EXTENSION_STARTLOCATION
-        if (rlv_handler_t::isEnabled())
-        {
-                RlvSettings::updateLoginLastLocation();
-        }
-        #endif // RLV_EXTENSION_STARTLOCATION
-// [/RLVa:KB]
         mRoot.getXform()->setParent(NULL); // LLVOAvatar::getOffObject
         mRoot.setPosition(cur_position_world);
         mRoot.setRotation(cur_rotation_world);
@@ -6833,6 +6826,15 @@ void LLVOAvatar::getOffObject()
 
         if (mIsSelf)
         {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+                #ifdef RLV_EXTENSION_STARTLOCATION
+                if (rlv_handler_t::isEnabled())
+                {
+                        RlvSettings::updateLoginLastLocation();
+                }
+                #endif // RLV_EXTENSION_STARTLOCATION
+// [/RLVa:KB]
+
                 LLQuaternion av_rot = gAgent.getFrameAgent().getQuaternion();
                 LLQuaternion obj_rot = sit_object ? sit_object->getRenderRotation() : LLQuaternion::DEFAULT;
                 av_rot = av_rot * obj_rot;
@@ -6908,6 +6910,20 @@ LLViewerObject* LLVOAvatar::getWornAttachment( const LLUUID& inv_item_id )
         return NULL;
 }
 
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+LLViewerJointAttachment* LLVOAvatar::getWornAttachmentPoint(const LLUUID& inv_item_id)
+{
+        for (attachment_map_t::const_iterator itAttach = mAttachmentPoints.begin();
+                        itAttach != mAttachmentPoints.end(); ++itAttach)
+        {
+                LLViewerJointAttachment* pAttachPt = itAttach->second;
+                if (pAttachPt->getItemID() == inv_item_id)
+                        return pAttachPt;
+        }
+        return NULL;
+}
+// [/RLVa:KB]
+
 const std::string LLVOAvatar::getAttachedPointName(const LLUUID& inv_item_id)
 {
         for (attachment_map_t::iterator iter = mAttachmentPoints.begin();