Second Life viewer sources 1.18.5.0-RC

1 files changed, 31 insertions, 6 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 42fc27d..8b49d54 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -903,6 +903,7 @@ BOOL LLAgent::canManageEstate() const
 {
         return mRegionp && mRegionp->canManageEstate();
 }
+
 //-----------------------------------------------------------------------------
 // sendMessage()
 //-----------------------------------------------------------------------------
@@ -2934,6 +2935,7 @@ void LLAgent::endAnimationUpdateUI()
         // Don't let this be called more than once if the camera
         // mode hasn't changed.  --JC
         mLastCameraMode = mCameraMode;
+
 }
 
 
@@ -4194,15 +4196,22 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL animate)
         if (animate && !mAvatarObject.isNull())
         {
                 sendAnimationRequest(ANIM_AGENT_CUSTOMIZE, ANIM_REQUEST_START);
+                mAvatarObject->startMotion(ANIM_AGENT_CUSTOMIZE);
                 LLMotion* turn_motion = mAvatarObject->findMotion(ANIM_AGENT_CUSTOMIZE);
+
                 if (turn_motion)
                 {
                         mAnimationDuration = turn_motion->getDuration() + CUSTOMIZE_AVATAR_CAMERA_ANIM_SLOP;
+
                 }
                 else
                 {
                         mAnimationDuration = gSavedSettings.getF32("ZoomTime");
                 }
+
+
+
+
                 gAgent.setFocusGlobal(LLVector3d::zero);
         }
         else
@@ -4709,6 +4718,22 @@ U8 LLAgent::getGodLevel() const
 #endif
 }
 
+bool LLAgent::isTeen() const
+{
+        return mAccess < SIM_ACCESS_MATURE;
+}
+
+void LLAgent::setTeen(bool teen)
+{
+        if (teen)
+        {
+                mAccess = SIM_ACCESS_PG;
+        }
+        else
+        {
+                mAccess = SIM_ACCESS_MATURE;
+        }
+}
 
 void LLAgent::buildFullname(std::string& name) const
 {
@@ -5627,7 +5652,7 @@ void LLAgent::teleportRequest(
 }
 
 // Landmark ID = LLUUID::null means teleport home
-void LLAgent::teleportViaLandmark(const LLUUID& landmark_id)
+void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 {
         LLViewerRegion *regionp = getRegion();
         if(regionp && teleportCore())
@@ -5637,7 +5662,7 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_id)
                 msg->nextBlockFast(_PREHASH_Info);
                 msg->addUUIDFast(_PREHASH_AgentID, getID());
                 msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
-                msg->addUUIDFast(_PREHASH_LandmarkID, landmark_id);
+                msg->addUUIDFast(_PREHASH_LandmarkID, landmark_asset_id);
                 sendReliableMessage();
         }
 }
@@ -6850,7 +6875,7 @@ void LLAgent::removeWearable( EWearableType type )
 {
         LLWearable* old_wearable = mWearableEntry[ type ].mWearable;
 
-        if ( (gAgent.mAccess < SIM_ACCESS_MATURE)
+        if ( (gAgent.isTeen())
                  && (type == WT_UNDERSHIRT || type == WT_UNDERPANTS))
         {
                 // Can't take off underclothing in simple UI mode or on PG accounts
@@ -6985,8 +7010,8 @@ void LLAgent::setWearableOutfit(
         wearables_to_remove[WT_SOCKS]           = remove;
         wearables_to_remove[WT_JACKET]          = remove;
         wearables_to_remove[WT_GLOVES]          = remove;
-        wearables_to_remove[WT_UNDERSHIRT]      = (gAgent.mAccess >= SIM_ACCESS_MATURE) & remove;
-        wearables_to_remove[WT_UNDERPANTS]      = (gAgent.mAccess >= SIM_ACCESS_MATURE) & remove;
+        wearables_to_remove[WT_UNDERSHIRT]      = (!gAgent.isTeen()) & remove;
+        wearables_to_remove[WT_UNDERPANTS]      = (!gAgent.isTeen()) & remove;
         wearables_to_remove[WT_SKIRT]           = remove;
 
         S32 count = wearables.count();
@@ -7224,7 +7249,7 @@ void LLAgent::userRemoveWearable( void* userdata )
         EWearableType type = (EWearableType)(intptr_t)userdata;
         
         if( !(type==WT_SHAPE || type==WT_SKIN || type==WT_HAIR ) ) //&&
-                //!((gAgent.mAccess >= SIM_ACCESS_MATURE) && ( type==WT_UNDERPANTS || type==WT_UNDERSHIRT )) )
+                //!((!gAgent.isTeen()) && ( type==WT_UNDERPANTS || type==WT_UNDERSHIRT )) )
         {
                 gAgent.removeWearable( type );
         }