Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 5013 insertions, 5013 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f1fac106c7..dd2495342b 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerobject.cpp
  * @brief Base class for viewer objects
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -110,24 +110,24 @@
 
 //#define DEBUG_UPDATE_TYPE
 
-BOOL		LLViewerObject::sVelocityInterpolate = TRUE;
-BOOL		LLViewerObject::sPingInterpolate = TRUE; 
+BOOL        LLViewerObject::sVelocityInterpolate = TRUE;
+BOOL        LLViewerObject::sPingInterpolate = TRUE;
 
-U32			LLViewerObject::sNumZombieObjects = 0;
-S32			LLViewerObject::sNumObjects = 0;
-BOOL		LLViewerObject::sMapDebug = TRUE;
-LLColor4	LLViewerObject::sEditSelectColor(	1.0f, 1.f, 0.f, 0.3f);	// Edit OK
-LLColor4	LLViewerObject::sNoEditSelectColor(	1.0f, 0.f, 0.f, 0.3f);	// Can't edit
-S32			LLViewerObject::sAxisArrowLength(50);
+U32         LLViewerObject::sNumZombieObjects = 0;
+S32         LLViewerObject::sNumObjects = 0;
+BOOL        LLViewerObject::sMapDebug = TRUE;
+LLColor4    LLViewerObject::sEditSelectColor(   1.0f, 1.f, 0.f, 0.3f);  // Edit OK
+LLColor4    LLViewerObject::sNoEditSelectColor( 1.0f, 0.f, 0.f, 0.3f);  // Can't edit
+S32         LLViewerObject::sAxisArrowLength(50);
 
 
-BOOL		LLViewerObject::sPulseEnabled(FALSE);
-BOOL		LLViewerObject::sUseSharedDrawables(FALSE); // TRUE
+BOOL        LLViewerObject::sPulseEnabled(FALSE);
+BOOL        LLViewerObject::sUseSharedDrawables(FALSE); // TRUE
 
 // sMaxUpdateInterpolationTime must be greater than sPhaseOutUpdateInterpolationTime
-F64Seconds	LLViewerObject::sMaxUpdateInterpolationTime(3.0);		// For motion interpolation: after X seconds with no updates, don't predict object motion
-F64Seconds	LLViewerObject::sPhaseOutUpdateInterpolationTime(2.0);	// For motion interpolation: after Y seconds with no updates, taper off motion prediction
-F64Seconds	LLViewerObject::sMaxRegionCrossingInterpolationTime(1.0);// For motion interpolation: don't interpolate over this time on region crossing
+F64Seconds  LLViewerObject::sMaxUpdateInterpolationTime(3.0);       // For motion interpolation: after X seconds with no updates, don't predict object motion
+F64Seconds  LLViewerObject::sPhaseOutUpdateInterpolationTime(2.0);  // For motion interpolation: after Y seconds with no updates, taper off motion prediction
+F64Seconds  LLViewerObject::sMaxRegionCrossingInterpolationTime(1.0);// For motion interpolation: don't interpolate over this time on region crossing
 
 std::map<std::string, U32> LLViewerObject::sObjectDataMap;
 
@@ -151,194 +151,194 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
     LL_PROFILE_ZONE_SCOPED;
     LL_DEBUGS("ObjectUpdate") << "creating " << id << LL_ENDL;
     dumpStack("ObjectUpdateStack");
-    
-	LLViewerObject *res = NULL;
-
-	if (gNonInteractive
-		&& pcode != LL_PCODE_LEGACY_AVATAR
-		&& pcode != LL_VO_SURFACE_PATCH
-		&& pcode != LL_VO_WATER
-		&& pcode != LL_VO_VOID_WATER
-		&& pcode != LL_VO_WL_SKY
-		&& pcode != LL_VO_SKY
-		&& pcode != LL_VO_PART_GROUP
-		)
-	{
-		return res;
-	}
-	switch (pcode)
-	{
-	case LL_PCODE_VOLUME:
-	{
-		res = new LLVOVolume(id, pcode, regionp); break;
-		break;
-	}
-	case LL_PCODE_LEGACY_AVATAR:
-	{
-		if (id == gAgentID)
-		{
-			if (!gAgentAvatarp)
-			{
-				gAgentAvatarp = new LLVOAvatarSelf(id, pcode, regionp);
-				gAgentAvatarp->initInstance();
-				gAgentWearables.setAvatarObject(gAgentAvatarp);
-			}
-			else 
-			{
-				if (isAgentAvatarValid())
-				{
-					gAgentAvatarp->updateRegion(regionp);
-				}
-			}
-			res = gAgentAvatarp;
-		}
-		else if (flags & CO_FLAG_CONTROL_AVATAR)
-		{
+
+    LLViewerObject *res = NULL;
+
+    if (gNonInteractive
+        && pcode != LL_PCODE_LEGACY_AVATAR
+        && pcode != LL_VO_SURFACE_PATCH
+        && pcode != LL_VO_WATER
+        && pcode != LL_VO_VOID_WATER
+        && pcode != LL_VO_WL_SKY
+        && pcode != LL_VO_SKY
+        && pcode != LL_VO_PART_GROUP
+        )
+    {
+        return res;
+    }
+    switch (pcode)
+    {
+    case LL_PCODE_VOLUME:
+    {
+        res = new LLVOVolume(id, pcode, regionp); break;
+        break;
+    }
+    case LL_PCODE_LEGACY_AVATAR:
+    {
+        if (id == gAgentID)
+        {
+            if (!gAgentAvatarp)
+            {
+                gAgentAvatarp = new LLVOAvatarSelf(id, pcode, regionp);
+                gAgentAvatarp->initInstance();
+                gAgentWearables.setAvatarObject(gAgentAvatarp);
+            }
+            else
+            {
+                if (isAgentAvatarValid())
+                {
+                    gAgentAvatarp->updateRegion(regionp);
+                }
+            }
+            res = gAgentAvatarp;
+        }
+        else if (flags & CO_FLAG_CONTROL_AVATAR)
+        {
             LLControlAvatar *control_avatar = new LLControlAvatar(id, pcode, regionp);
-			control_avatar->initInstance();
-			res = control_avatar;
-		}
+            control_avatar->initInstance();
+            res = control_avatar;
+        }
         else if (flags & CO_FLAG_UI_AVATAR)
         {
             LLUIAvatar *ui_avatar = new LLUIAvatar(id, pcode, regionp);
             ui_avatar->initInstance();
             res = ui_avatar;
         }
-		else
-		{
-			LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp); 
-			avatar->initInstance();
-			res = avatar;
-		}
-		break;
-	}
-	case LL_PCODE_LEGACY_GRASS:
-	  res = new LLVOGrass(id, pcode, regionp); break;
-	case LL_PCODE_LEGACY_PART_SYS:
-// 	  LL_WARNS() << "Creating old part sys!" << LL_ENDL;
-// 	  res = new LLVOPart(id, pcode, regionp); break;
-	  res = NULL; break;
-	case LL_PCODE_LEGACY_TREE:
-	  res = new LLVOTree(id, pcode, regionp); break;
-	case LL_PCODE_TREE_NEW:
-// 	  LL_WARNS() << "Creating new tree!" << LL_ENDL;
-// 	  res = new LLVOTree(id, pcode, regionp); break;
-	  res = NULL; break;
-	case LL_VO_SURFACE_PATCH:
-	  res = new LLVOSurfacePatch(id, pcode, regionp); break;
-	case LL_VO_SKY:
-	  res = new LLVOSky(id, pcode, regionp); break;
-	case LL_VO_VOID_WATER:
-		res = new LLVOVoidWater(id, pcode, regionp); break;
-	case LL_VO_WATER:
-		res = new LLVOWater(id, pcode, regionp); break;
-	case LL_VO_PART_GROUP:
-	  res = new LLVOPartGroup(id, pcode, regionp); break;
-	case LL_VO_HUD_PART_GROUP:
-	  res = new LLVOHUDPartGroup(id, pcode, regionp); break;
-	case LL_VO_WL_SKY:
-	  res = new LLVOWLSky(id, pcode, regionp); break;
-	default:
-	  LL_WARNS() << "Unknown object pcode " << (S32)pcode << LL_ENDL;
-	  res = NULL; break;
-	}
-
-	return res;
+        else
+        {
+            LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp);
+            avatar->initInstance();
+            res = avatar;
+        }
+        break;
+    }
+    case LL_PCODE_LEGACY_GRASS:
+      res = new LLVOGrass(id, pcode, regionp); break;
+    case LL_PCODE_LEGACY_PART_SYS:
+//    LL_WARNS() << "Creating old part sys!" << LL_ENDL;
+//    res = new LLVOPart(id, pcode, regionp); break;
+      res = NULL; break;
+    case LL_PCODE_LEGACY_TREE:
+      res = new LLVOTree(id, pcode, regionp); break;
+    case LL_PCODE_TREE_NEW:
+//    LL_WARNS() << "Creating new tree!" << LL_ENDL;
+//    res = new LLVOTree(id, pcode, regionp); break;
+      res = NULL; break;
+    case LL_VO_SURFACE_PATCH:
+      res = new LLVOSurfacePatch(id, pcode, regionp); break;
+    case LL_VO_SKY:
+      res = new LLVOSky(id, pcode, regionp); break;
+    case LL_VO_VOID_WATER:
+        res = new LLVOVoidWater(id, pcode, regionp); break;
+    case LL_VO_WATER:
+        res = new LLVOWater(id, pcode, regionp); break;
+    case LL_VO_PART_GROUP:
+      res = new LLVOPartGroup(id, pcode, regionp); break;
+    case LL_VO_HUD_PART_GROUP:
+      res = new LLVOHUDPartGroup(id, pcode, regionp); break;
+    case LL_VO_WL_SKY:
+      res = new LLVOWLSky(id, pcode, regionp); break;
+    default:
+      LL_WARNS() << "Unknown object pcode " << (S32)pcode << LL_ENDL;
+      res = NULL; break;
+    }
+
+    return res;
 }
 
 LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp, BOOL is_global)
-:	LLPrimitive(),
-	mChildList(),
-	mID(id),
-	mLocalID(0),
-	mTotalCRC(0),
-	mListIndex(-1),
-	mTEImages(NULL),
-	mTENormalMaps(NULL),
-	mTESpecularMaps(NULL),
-	mbCanSelect(TRUE),
-	mFlags(0),
-	mPhysicsShapeType(0),
-	mPhysicsGravity(0),
-	mPhysicsFriction(0),
-	mPhysicsDensity(0),
-	mPhysicsRestitution(0),
-	mDrawable(),
-	mCreateSelected(FALSE),
-	mRenderMedia(FALSE),
-	mBestUpdatePrecision(0),
-	mText(),
-	mHudText(""),
-	mHudTextColor(LLColor4::white),
+:   LLPrimitive(),
+    mChildList(),
+    mID(id),
+    mLocalID(0),
+    mTotalCRC(0),
+    mListIndex(-1),
+    mTEImages(NULL),
+    mTENormalMaps(NULL),
+    mTESpecularMaps(NULL),
+    mbCanSelect(TRUE),
+    mFlags(0),
+    mPhysicsShapeType(0),
+    mPhysicsGravity(0),
+    mPhysicsFriction(0),
+    mPhysicsDensity(0),
+    mPhysicsRestitution(0),
+    mDrawable(),
+    mCreateSelected(FALSE),
+    mRenderMedia(FALSE),
+    mBestUpdatePrecision(0),
+    mText(),
+    mHudText(""),
+    mHudTextColor(LLColor4::white),
     mControlAvatar(NULL),
-	mLastInterpUpdateSecs(0.f),
-	mLastMessageUpdateSecs(0.f),
-	mLatestRecvPacketID(0),
-	mRegionCrossExpire(0),
-	mData(NULL),
-	mAudioSourcep(NULL),
-	mAudioGain(1.f),
-	mSoundCutOffRadius(0.f),
-	mAppAngle(0.f),
-	mPixelArea(1024.f),
-	mInventory(NULL),
-	mInventorySerialNum(0),
-	mExpectedInventorySerialNum(0),
-	mInvRequestState(INVENTORY_REQUEST_STOPPED),
-	mInvRequestXFerId(0),
-	mInventoryDirty(FALSE),
-	mRegionp(regionp),
-	mDead(FALSE),
-	mOrphaned(FALSE),
-	mUserSelected(FALSE),
-	mOnActiveList(FALSE),
-	mOnMap(FALSE),
-	mStatic(FALSE),
-	mSeatCount(0),
-	mNumFaces(0),
-	mRotTime(0.f),
-	mAngularVelocityRot(),
-	mPreviousRotation(),
-	mAttachmentState(0),
-	mMedia(NULL),
-	mClickAction(0),
-	mObjectCost(0),
-	mLinksetCost(0),
-	mPhysicsCost(0),
-	mLinksetPhysicsCost(0.f),
-	mCostStale(true),
-	mPhysicsShapeUnknown(true),
-	mAttachmentItemID(LLUUID::null),
-	mLastUpdateType(OUT_UNKNOWN),
-	mLastUpdateCached(FALSE),
-	mCachedMuteListUpdateTime(0),
-	mCachedOwnerInMuteList(false),
-	mRiggedAttachedWarned(false)
-{
-	if (!is_global)
-	{
-		llassert(mRegionp);
-	}
-
-	LLPrimitive::init_primitive(pcode);
-
-	// CP: added 12/2/2005 - this was being initialised to 0, not the current frame time
-	mLastInterpUpdateSecs = LLFrameTimer::getElapsedSeconds();
-
-	mPositionRegion = LLVector3(0.f, 0.f, 0.f);
-
-	if (!is_global && mRegionp)
-	{
-		mPositionAgent = mRegionp->getOriginAgent();
-	}
-	resetRot();
-
-	LLViewerObject::sNumObjects++;
+    mLastInterpUpdateSecs(0.f),
+    mLastMessageUpdateSecs(0.f),
+    mLatestRecvPacketID(0),
+    mRegionCrossExpire(0),
+    mData(NULL),
+    mAudioSourcep(NULL),
+    mAudioGain(1.f),
+    mSoundCutOffRadius(0.f),
+    mAppAngle(0.f),
+    mPixelArea(1024.f),
+    mInventory(NULL),
+    mInventorySerialNum(0),
+    mExpectedInventorySerialNum(0),
+    mInvRequestState(INVENTORY_REQUEST_STOPPED),
+    mInvRequestXFerId(0),
+    mInventoryDirty(FALSE),
+    mRegionp(regionp),
+    mDead(FALSE),
+    mOrphaned(FALSE),
+    mUserSelected(FALSE),
+    mOnActiveList(FALSE),
+    mOnMap(FALSE),
+    mStatic(FALSE),
+    mSeatCount(0),
+    mNumFaces(0),
+    mRotTime(0.f),
+    mAngularVelocityRot(),
+    mPreviousRotation(),
+    mAttachmentState(0),
+    mMedia(NULL),
+    mClickAction(0),
+    mObjectCost(0),
+    mLinksetCost(0),
+    mPhysicsCost(0),
+    mLinksetPhysicsCost(0.f),
+    mCostStale(true),
+    mPhysicsShapeUnknown(true),
+    mAttachmentItemID(LLUUID::null),
+    mLastUpdateType(OUT_UNKNOWN),
+    mLastUpdateCached(FALSE),
+    mCachedMuteListUpdateTime(0),
+    mCachedOwnerInMuteList(false),
+    mRiggedAttachedWarned(false)
+{
+    if (!is_global)
+    {
+        llassert(mRegionp);
+    }
+
+    LLPrimitive::init_primitive(pcode);
+
+    // CP: added 12/2/2005 - this was being initialised to 0, not the current frame time
+    mLastInterpUpdateSecs = LLFrameTimer::getElapsedSeconds();
+
+    mPositionRegion = LLVector3(0.f, 0.f, 0.f);
+
+    if (!is_global && mRegionp)
+    {
+        mPositionAgent = mRegionp->getOriginAgent();
+    }
+    resetRot();
+
+    LLViewerObject::sNumObjects++;
 }
 
 LLViewerObject::~LLViewerObject()
 {
-	deleteTEImages();
+    deleteTEImages();
 
     // unhook from reflection probe manager
     if (mReflectionProbe.notNull())
@@ -347,18 +347,18 @@ LLViewerObject::~LLViewerObject()
         mReflectionProbe = nullptr;
     }
 
-	if(mInventory)
-	{
-		mInventory->clear();  // will deref and delete entries
-		delete mInventory;
-		mInventory = NULL;
-	}
+    if(mInventory)
+    {
+        mInventory->clear();  // will deref and delete entries
+        delete mInventory;
+        mInventory = NULL;
+    }
 
-	if (mPartSourcep)
-	{
-		mPartSourcep->setDead();
-		mPartSourcep = NULL;
-	}
+    if (mPartSourcep)
+    {
+        mPartSourcep->setDead();
+        mPartSourcep = NULL;
+    }
 
     if (mText)
     {
@@ -367,30 +367,30 @@ LLViewerObject::~LLViewerObject()
         mText = NULL;
     }
 
-	// Delete memory associated with extra parameters.
-	std::unordered_map<U16, ExtraParameter*>::iterator iter;
-	for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
-	{
-		if(iter->second != NULL)
-		{
-			delete iter->second->data;
-			delete iter->second;
-		}
-	}
-	mExtraParameterList.clear();
-
-	for_each(mNameValuePairs.begin(), mNameValuePairs.end(), DeletePairedPointer()) ;
-	mNameValuePairs.clear();
-	
-	delete[] mData;
-	mData = NULL;
-
-	delete mMedia;
-	mMedia = NULL;
-
-	sNumObjects--;
-	sNumZombieObjects--;
-	llassert(mChildList.size() == 0);
+    // Delete memory associated with extra parameters.
+    std::unordered_map<U16, ExtraParameter*>::iterator iter;
+    for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
+    {
+        if(iter->second != NULL)
+        {
+            delete iter->second->data;
+            delete iter->second;
+        }
+    }
+    mExtraParameterList.clear();
+
+    for_each(mNameValuePairs.begin(), mNameValuePairs.end(), DeletePairedPointer()) ;
+    mNameValuePairs.clear();
+
+    delete[] mData;
+    mData = NULL;
+
+    delete mMedia;
+    mMedia = NULL;
+
+    sNumObjects--;
+    sNumZombieObjects--;
+    llassert(mChildList.size() == 0);
     llassert(mControlAvatar.isNull()); // Should have been cleaned by now
     if (mControlAvatar.notNull())
     {
@@ -399,40 +399,40 @@ LLViewerObject::~LLViewerObject()
         LL_WARNS() << "Dead object owned a live control avatar" << LL_ENDL;
     }
 
-	clearInventoryListeners();
+    clearInventoryListeners();
 }
 
 void LLViewerObject::deleteTEImages()
 {
-	delete[] mTEImages;
-	mTEImages = NULL;
-	
-	if (mTENormalMaps != NULL)
-	{
-		delete[] mTENormalMaps;
-		mTENormalMaps = NULL;
-	}
-	
-	if (mTESpecularMaps != NULL)
-	{
-		delete[] mTESpecularMaps;
-		mTESpecularMaps = NULL;
-	}	
+    delete[] mTEImages;
+    mTEImages = NULL;
+
+    if (mTENormalMaps != NULL)
+    {
+        delete[] mTENormalMaps;
+        mTENormalMaps = NULL;
+    }
+
+    if (mTESpecularMaps != NULL)
+    {
+        delete[] mTESpecularMaps;
+        mTESpecularMaps = NULL;
+    }
 }
 
 void LLViewerObject::markDead()
 {
-	if (!mDead)
-	{
+    if (!mDead)
+    {
         LL_PROFILE_ZONE_SCOPED;
-		//LL_INFOS() << "Marking self " << mLocalID << " as dead." << LL_ENDL;
-		
-		// Root object of this hierarchy unlinks itself.
-		if (getParent())
-		{
-			((LLViewerObject *)getParent())->removeChild(this);
-		}
-		LLUUID mesh_id;
+        //LL_INFOS() << "Marking self " << mLocalID << " as dead." << LL_ENDL;
+
+        // Root object of this hierarchy unlinks itself.
+        if (getParent())
+        {
+            ((LLViewerObject *)getParent())->removeChild(this);
+        }
+        LLUUID mesh_id;
         {
             LLVOAvatar *av = getAvatar();
             if (av && LLVOAvatar::getRiggedMeshID(this,mesh_id))
@@ -446,83 +446,83 @@ void LLViewerObject::markDead()
             unlinkControlAvatar();
         }
 
-		// Mark itself as dead
-		mDead = TRUE;
-		if(mRegionp)
-		{
-			mRegionp->removeFromCreatedList(getLocalID()); 
-		}
-		gObjectList.cleanupReferences(this);
-
-		LLViewerObject *childp;
-		while (mChildList.size() > 0)
-		{
-			childp = mChildList.back();
-			if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
-			{
-				//LL_INFOS() << "Marking child " << childp->getLocalID() << " as dead." << LL_ENDL;
-				childp->setParent(NULL); // LLViewerObject::markDead 1
-				childp->markDead();
-			}
-			else
-			{
-				// make sure avatar is no longer parented, 
-				// so we can properly set it's position
-				childp->setDrawableParent(NULL);
-				((LLVOAvatar*)childp)->getOffObject();
-				childp->setParent(NULL); // LLViewerObject::markDead 2
-			}
-			mChildList.pop_back();
-		}
-
-		if (mDrawable.notNull())
-		{
-			// Drawables are reference counted, mark as dead, then nuke the pointer.
-			mDrawable->markDead();
-			mDrawable = NULL;
-		}
-
-		if (mText)
-		{
-			mText->markDead();
-			mText = NULL;
-		}
-
-		if (mIcon)
-		{
-			mIcon->markDead();
-			mIcon = NULL;
-		}
-
-		if (mPartSourcep)
-		{
-			mPartSourcep->setDead();
-			mPartSourcep = NULL;
-		}
-
-		if (mAudioSourcep)
-		{
-			// Do some cleanup
-			if (gAudiop)
-			{
-				gAudiop->cleanupAudioSource(mAudioSourcep);
-			}
-			mAudioSourcep = NULL;
-		}
-
-		if (flagAnimSource())
-		{
-			if (isAgentAvatarValid())
-			{
-				// stop motions associated with this object
-				gAgentAvatarp->stopMotionFromSource(mID);
-			}
-		}
-
-		if (flagCameraSource())
-		{
-			LLFollowCamMgr::getInstance()->removeFollowCamParams(mID);
-		}
+        // Mark itself as dead
+        mDead = TRUE;
+        if(mRegionp)
+        {
+            mRegionp->removeFromCreatedList(getLocalID());
+        }
+        gObjectList.cleanupReferences(this);
+
+        LLViewerObject *childp;
+        while (mChildList.size() > 0)
+        {
+            childp = mChildList.back();
+            if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+            {
+                //LL_INFOS() << "Marking child " << childp->getLocalID() << " as dead." << LL_ENDL;
+                childp->setParent(NULL); // LLViewerObject::markDead 1
+                childp->markDead();
+            }
+            else
+            {
+                // make sure avatar is no longer parented,
+                // so we can properly set it's position
+                childp->setDrawableParent(NULL);
+                ((LLVOAvatar*)childp)->getOffObject();
+                childp->setParent(NULL); // LLViewerObject::markDead 2
+            }
+            mChildList.pop_back();
+        }
+
+        if (mDrawable.notNull())
+        {
+            // Drawables are reference counted, mark as dead, then nuke the pointer.
+            mDrawable->markDead();
+            mDrawable = NULL;
+        }
+
+        if (mText)
+        {
+            mText->markDead();
+            mText = NULL;
+        }
+
+        if (mIcon)
+        {
+            mIcon->markDead();
+            mIcon = NULL;
+        }
+
+        if (mPartSourcep)
+        {
+            mPartSourcep->setDead();
+            mPartSourcep = NULL;
+        }
+
+        if (mAudioSourcep)
+        {
+            // Do some cleanup
+            if (gAudiop)
+            {
+                gAudiop->cleanupAudioSource(mAudioSourcep);
+            }
+            mAudioSourcep = NULL;
+        }
+
+        if (flagAnimSource())
+        {
+            if (isAgentAvatarValid())
+            {
+                // stop motions associated with this object
+                gAgentAvatarp->stopMotionFromSource(mID);
+            }
+        }
+
+        if (flagCameraSource())
+        {
+            LLFollowCamMgr::getInstance()->removeFollowCamParams(mID);
+        }
 
         if (mReflectionProbe.notNull())
         {
@@ -530,225 +530,225 @@ void LLViewerObject::markDead()
             mReflectionProbe = nullptr;
         }
 
-		sNumZombieObjects++;
-	}
+        sNumZombieObjects++;
+    }
 }
 
 void LLViewerObject::dump() const
 {
-	LL_INFOS() << "Type: " << pCodeToString(mPrimitiveCode) << LL_ENDL;
-	LL_INFOS() << "Drawable: " << (LLDrawable *)mDrawable << LL_ENDL;
-	LL_INFOS() << "Update Age: " << LLFrameTimer::getElapsedSeconds() - mLastMessageUpdateSecs << LL_ENDL;
-
-	LL_INFOS() << "Parent: " << getParent() << LL_ENDL;
-	LL_INFOS() << "ID: " << mID << LL_ENDL;
-	LL_INFOS() << "LocalID: " << mLocalID << LL_ENDL;
-	LL_INFOS() << "PositionRegion: " << getPositionRegion() << LL_ENDL;
-	LL_INFOS() << "PositionAgent: " << getPositionAgent() << LL_ENDL;
-	LL_INFOS() << "PositionGlobal: " << getPositionGlobal() << LL_ENDL;
-	LL_INFOS() << "Velocity: " << getVelocity() << LL_ENDL;
-	if (mDrawable.notNull() && 
-		mDrawable->getNumFaces() && 
-		mDrawable->getFace(0))
-	{
-		LLFacePool *poolp = mDrawable->getFace(0)->getPool();
-		if (poolp)
-		{
-			LL_INFOS() << "Pool: " << poolp << LL_ENDL;
-			LL_INFOS() << "Pool reference count: " << poolp->mReferences.size() << LL_ENDL;
-		}
-	}
-	//LL_INFOS() << "BoxTree Min: " << mDrawable->getBox()->getMin() << LL_ENDL;
-	//LL_INFOS() << "BoxTree Max: " << mDrawable->getBox()->getMin() << LL_ENDL;
-	/*
-	LL_INFOS() << "Velocity: " << getVelocity() << LL_ENDL;
-	LL_INFOS() << "AnyOwner: " << permAnyOwner() << " YouOwner: " << permYouOwner() << " Edit: " << mPermEdit << LL_ENDL;
-	LL_INFOS() << "UsePhysics: " << flagUsePhysics() << " CanSelect " << mbCanSelect << " UserSelected " << mUserSelected << LL_ENDL;
-	LL_INFOS() << "AppAngle: " << mAppAngle << LL_ENDL;
-	LL_INFOS() << "PixelArea: " << mPixelArea << LL_ENDL;
-
-	char buffer[1000];
-	char *key;
-	for (key = mNameValuePairs.getFirstKey(); key; key = mNameValuePairs.getNextKey() )
-	{
-		mNameValuePairs[key]->printNameValue(buffer);
-		LL_INFOS() << buffer << LL_ENDL;
-	}
-	for (child_list_t::iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* child = *iter;
-		LL_INFOS() << "  child " << child->getID() << LL_ENDL;
-	}
-	*/
+    LL_INFOS() << "Type: " << pCodeToString(mPrimitiveCode) << LL_ENDL;
+    LL_INFOS() << "Drawable: " << (LLDrawable *)mDrawable << LL_ENDL;
+    LL_INFOS() << "Update Age: " << LLFrameTimer::getElapsedSeconds() - mLastMessageUpdateSecs << LL_ENDL;
+
+    LL_INFOS() << "Parent: " << getParent() << LL_ENDL;
+    LL_INFOS() << "ID: " << mID << LL_ENDL;
+    LL_INFOS() << "LocalID: " << mLocalID << LL_ENDL;
+    LL_INFOS() << "PositionRegion: " << getPositionRegion() << LL_ENDL;
+    LL_INFOS() << "PositionAgent: " << getPositionAgent() << LL_ENDL;
+    LL_INFOS() << "PositionGlobal: " << getPositionGlobal() << LL_ENDL;
+    LL_INFOS() << "Velocity: " << getVelocity() << LL_ENDL;
+    if (mDrawable.notNull() &&
+        mDrawable->getNumFaces() &&
+        mDrawable->getFace(0))
+    {
+        LLFacePool *poolp = mDrawable->getFace(0)->getPool();
+        if (poolp)
+        {
+            LL_INFOS() << "Pool: " << poolp << LL_ENDL;
+            LL_INFOS() << "Pool reference count: " << poolp->mReferences.size() << LL_ENDL;
+        }
+    }
+    //LL_INFOS() << "BoxTree Min: " << mDrawable->getBox()->getMin() << LL_ENDL;
+    //LL_INFOS() << "BoxTree Max: " << mDrawable->getBox()->getMin() << LL_ENDL;
+    /*
+    LL_INFOS() << "Velocity: " << getVelocity() << LL_ENDL;
+    LL_INFOS() << "AnyOwner: " << permAnyOwner() << " YouOwner: " << permYouOwner() << " Edit: " << mPermEdit << LL_ENDL;
+    LL_INFOS() << "UsePhysics: " << flagUsePhysics() << " CanSelect " << mbCanSelect << " UserSelected " << mUserSelected << LL_ENDL;
+    LL_INFOS() << "AppAngle: " << mAppAngle << LL_ENDL;
+    LL_INFOS() << "PixelArea: " << mPixelArea << LL_ENDL;
+
+    char buffer[1000];
+    char *key;
+    for (key = mNameValuePairs.getFirstKey(); key; key = mNameValuePairs.getNextKey() )
+    {
+        mNameValuePairs[key]->printNameValue(buffer);
+        LL_INFOS() << buffer << LL_ENDL;
+    }
+    for (child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        LL_INFOS() << "  child " << child->getID() << LL_ENDL;
+    }
+    */
 }
 
 void LLViewerObject::printNameValuePairs() const
 {
-	for (name_value_map_t::const_iterator iter = mNameValuePairs.begin();
-		 iter != mNameValuePairs.end(); iter++)
-	{
-		LLNameValue* nv = iter->second;
-		LL_INFOS() << nv->printNameValue() << LL_ENDL;
-	}
+    for (name_value_map_t::const_iterator iter = mNameValuePairs.begin();
+         iter != mNameValuePairs.end(); iter++)
+    {
+        LLNameValue* nv = iter->second;
+        LL_INFOS() << nv->printNameValue() << LL_ENDL;
+    }
 }
 
 void LLViewerObject::initVOClasses()
 {
-	// Initialized shared class stuff first.
-	LLVOAvatar::initClass();
-	LLVOTree::initClass();
-	LL_INFOS() << "Viewer Object size: " << sizeof(LLViewerObject) << LL_ENDL;
-	LLVOGrass::initClass();
-	LLVOWater::initClass();
-	LLVOVolume::initClass();
+    // Initialized shared class stuff first.
+    LLVOAvatar::initClass();
+    LLVOTree::initClass();
+    LL_INFOS() << "Viewer Object size: " << sizeof(LLViewerObject) << LL_ENDL;
+    LLVOGrass::initClass();
+    LLVOWater::initClass();
+    LLVOVolume::initClass();
 
-	initObjectDataMap();
+    initObjectDataMap();
 }
 
 void LLViewerObject::cleanupVOClasses()
 {
-	SUBSYSTEM_CLEANUP(LLVOGrass);
-	SUBSYSTEM_CLEANUP(LLVOWater);
-	SUBSYSTEM_CLEANUP(LLVOTree);
-	SUBSYSTEM_CLEANUP(LLVOAvatar);
-	SUBSYSTEM_CLEANUP(LLVOVolume);
+    SUBSYSTEM_CLEANUP(LLVOGrass);
+    SUBSYSTEM_CLEANUP(LLVOWater);
+    SUBSYSTEM_CLEANUP(LLVOTree);
+    SUBSYSTEM_CLEANUP(LLVOAvatar);
+    SUBSYSTEM_CLEANUP(LLVOVolume);
 
-	sObjectDataMap.clear();
+    sObjectDataMap.clear();
 }
 
 //object data map for compressed && !OUT_TERSE_IMPROVED
 //static
 void LLViewerObject::initObjectDataMap()
 {
-	U32 count = 0;
+    U32 count = 0;
 
-	sObjectDataMap["ID"] = count; //full id //LLUUID
-	count += sizeof(LLUUID);
+    sObjectDataMap["ID"] = count; //full id //LLUUID
+    count += sizeof(LLUUID);
 
-	sObjectDataMap["LocalID"] = count; //U32
-	count += sizeof(U32);
+    sObjectDataMap["LocalID"] = count; //U32
+    count += sizeof(U32);
 
-	sObjectDataMap["PCode"] = count;   //U8
-	count += sizeof(U8);
+    sObjectDataMap["PCode"] = count;   //U8
+    count += sizeof(U8);
 
-	sObjectDataMap["State"] = count;   //U8
-	count += sizeof(U8);
+    sObjectDataMap["State"] = count;   //U8
+    count += sizeof(U8);
 
-	sObjectDataMap["CRC"] = count;     //U32
-	count += sizeof(U32);
+    sObjectDataMap["CRC"] = count;     //U32
+    count += sizeof(U32);
 
-	sObjectDataMap["Material"] = count; //U8
-	count += sizeof(U8);
+    sObjectDataMap["Material"] = count; //U8
+    count += sizeof(U8);
 
-	sObjectDataMap["ClickAction"] = count; //U8
-	count += sizeof(U8);
+    sObjectDataMap["ClickAction"] = count; //U8
+    count += sizeof(U8);
 
-	sObjectDataMap["Scale"] = count; //LLVector3
-	count += sizeof(LLVector3);
+    sObjectDataMap["Scale"] = count; //LLVector3
+    count += sizeof(LLVector3);
 
-	sObjectDataMap["Pos"] = count;   //LLVector3
-	count += sizeof(LLVector3);
+    sObjectDataMap["Pos"] = count;   //LLVector3
+    count += sizeof(LLVector3);
 
-	sObjectDataMap["Rot"] = count;    //LLVector3
-	count += sizeof(LLVector3);
+    sObjectDataMap["Rot"] = count;    //LLVector3
+    count += sizeof(LLVector3);
 
-	sObjectDataMap["SpecialCode"] = count; //U32
-	count += sizeof(U32);
+    sObjectDataMap["SpecialCode"] = count; //U32
+    count += sizeof(U32);
 
-	sObjectDataMap["Owner"] = count; //LLUUID
-	count += sizeof(LLUUID);
+    sObjectDataMap["Owner"] = count; //LLUUID
+    count += sizeof(LLUUID);
 
-	sObjectDataMap["Omega"] = count; //LLVector3, when SpecialCode & 0x80 is set
-	count += sizeof(LLVector3);
+    sObjectDataMap["Omega"] = count; //LLVector3, when SpecialCode & 0x80 is set
+    count += sizeof(LLVector3);
 
-	//ParentID is after Omega if there is Omega, otherwise is after Owner
-	sObjectDataMap["ParentID"] = count;//U32, when SpecialCode & 0x20 is set
-	count += sizeof(U32);
+    //ParentID is after Omega if there is Omega, otherwise is after Owner
+    sObjectDataMap["ParentID"] = count;//U32, when SpecialCode & 0x20 is set
+    count += sizeof(U32);
 
-	//-------
-	//The rest items are not included here
-	//-------
+    //-------
+    //The rest items are not included here
+    //-------
 }
 
-//static 
+//static
 void LLViewerObject::unpackVector3(LLDataPackerBinaryBuffer* dp, LLVector3& value, std::string name)
 {
-	dp->shift(sObjectDataMap[name]);
-	dp->unpackVector3(value, name.c_str());
-	dp->reset();
+    dp->shift(sObjectDataMap[name]);
+    dp->unpackVector3(value, name.c_str());
+    dp->reset();
 }
 
-//static 
+//static
 void LLViewerObject::unpackUUID(LLDataPackerBinaryBuffer* dp, LLUUID& value, std::string name)
 {
-	dp->shift(sObjectDataMap[name]);
-	dp->unpackUUID(value, name.c_str());
-	dp->reset();
+    dp->shift(sObjectDataMap[name]);
+    dp->unpackUUID(value, name.c_str());
+    dp->reset();
 }
-	
-//static 
+
+//static
 void LLViewerObject::unpackU32(LLDataPackerBinaryBuffer* dp, U32& value, std::string name)
 {
-	dp->shift(sObjectDataMap[name]);
-	dp->unpackU32(value, name.c_str());
-	dp->reset();
+    dp->shift(sObjectDataMap[name]);
+    dp->unpackU32(value, name.c_str());
+    dp->reset();
 }
-	
-//static 
+
+//static
 void LLViewerObject::unpackU8(LLDataPackerBinaryBuffer* dp, U8& value, std::string name)
 {
-	dp->shift(sObjectDataMap[name]);
-	dp->unpackU8(value, name.c_str());
-	dp->reset();
+    dp->shift(sObjectDataMap[name]);
+    dp->unpackU8(value, name.c_str());
+    dp->reset();
 }
 
-//static 
+//static
 U32 LLViewerObject::unpackParentID(LLDataPackerBinaryBuffer* dp, U32& parent_id)
 {
-	dp->shift(sObjectDataMap["SpecialCode"]);
-	U32 value;
-	dp->unpackU32(value, "SpecialCode");
+    dp->shift(sObjectDataMap["SpecialCode"]);
+    U32 value;
+    dp->unpackU32(value, "SpecialCode");
 
-	parent_id = 0;
-	if(value & 0x20)
-	{
-		S32 offset = sObjectDataMap["ParentID"];
-		if(!(value & 0x80))
-		{
-			offset -= sizeof(LLVector3);
-		}
+    parent_id = 0;
+    if(value & 0x20)
+    {
+        S32 offset = sObjectDataMap["ParentID"];
+        if(!(value & 0x80))
+        {
+            offset -= sizeof(LLVector3);
+        }
 
-		dp->shift(offset);
-		dp->unpackU32(parent_id, "ParentID");
-	}
-	dp->reset();
+        dp->shift(offset);
+        dp->unpackU32(parent_id, "ParentID");
+    }
+    dp->reset();
 
-	return parent_id;
+    return parent_id;
 }
 
 // Replaces all name value pairs with data from \n delimited list
 // Does not update server
 void LLViewerObject::setNameValueList(const std::string& name_value_list)
 {
-	// Clear out the old
-	for_each(mNameValuePairs.begin(), mNameValuePairs.end(), DeletePairedPointer()) ;
-	mNameValuePairs.clear();
-
-	// Bring in the new
-	std::string::size_type length = name_value_list.length();
-	std::string::size_type start = 0;
-	while (start < length)
-	{
-		std::string::size_type end = name_value_list.find_first_of("\n", start);
-		if (end == std::string::npos) end = length;
-		if (end > start)
-		{
-			std::string tok = name_value_list.substr(start, end - start);
-			addNVPair(tok);
-		}
-		start = end+1;
-	}
+    // Clear out the old
+    for_each(mNameValuePairs.begin(), mNameValuePairs.end(), DeletePairedPointer()) ;
+    mNameValuePairs.clear();
+
+    // Bring in the new
+    std::string::size_type length = name_value_list.length();
+    std::string::size_type start = 0;
+    while (start < length)
+    {
+        std::string::size_type end = name_value_list.find_first_of("\n", start);
+        if (end == std::string::npos) end = length;
+        if (end > start)
+        {
+            std::string tok = name_value_list.substr(start, end - start);
+            addNVPair(tok);
+        }
+        start = end+1;
+    }
 }
 
 BOOL LLViewerObject::isAnySelected() const
@@ -765,183 +765,183 @@ BOOL LLViewerObject::isAnySelected() const
 
 void LLViewerObject::setSelected(BOOL sel)
 {
-	mUserSelected = sel;
-	resetRot();
+    mUserSelected = sel;
+    resetRot();
 
-	if (!sel)
-	{
-		setAllTESelected(false);
-	}
+    if (!sel)
+    {
+        setAllTESelected(false);
+    }
 }
 
 // This method returns true if the object is over land owned by the
 // agent.
 bool LLViewerObject::isReturnable()
 {
-	if (isAttachment())
-	{
-		return false;
-	}
-		
-	std::vector<LLBBox> boxes;
-	boxes.push_back(LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f).getAxisAligned());
-	for (child_list_t::iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* child = *iter;
-		boxes.push_back( LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned());
-	}
-
-	bool result = (mRegionp && mRegionp->objectIsReturnable(getPositionRegion(), boxes)) ? 1 : 0;
-	
-	if ( !result )
-	{		
-		//Get list of neighboring regions relative to this vo's region
-		std::vector<LLViewerRegion*> uniqueRegions;
-		mRegionp->getNeighboringRegions( uniqueRegions );
-	
-		//Build aabb's - for root and all children
-		std::vector<PotentialReturnableObject> returnables;
-		typedef std::vector<LLViewerRegion*>::iterator RegionIt;
-		RegionIt regionStart = uniqueRegions.begin();
-		RegionIt regionEnd   = uniqueRegions.end();
-		
-		for (; regionStart != regionEnd; ++regionStart )
-		{
-			LLViewerRegion* pTargetRegion = *regionStart;
-			//Add the root vo as there may be no children and we still want
-			//to test for any edge overlap
-			buildReturnablesForChildrenVO( returnables, this, pTargetRegion );
-			//Add it's children
-			for (child_list_t::iterator iter = mChildList.begin();  iter != mChildList.end(); iter++)
-			{
-				LLViewerObject* pChild = *iter;		
-				buildReturnablesForChildrenVO( returnables, pChild, pTargetRegion );
-			}
-		}	
-	
-		//TBD#Eventually create a region -> box list map 
-		typedef std::vector<PotentialReturnableObject>::iterator ReturnablesIt;
-		ReturnablesIt retCurrentIt = returnables.begin();
-		ReturnablesIt retEndIt = returnables.end();
-	
-		for ( ; retCurrentIt !=retEndIt; ++retCurrentIt )
-		{
-			boxes.clear();
-			LLViewerRegion* pRegion = (*retCurrentIt).pRegion;
-			boxes.push_back( (*retCurrentIt).box );	
-			bool retResult = 	pRegion
-							 && pRegion->childrenObjectReturnable( boxes )
-							 && pRegion->canManageEstate();
-			if ( retResult )
-			{ 
-				result = true;
-				break;
-			}
-		}
-	}
-	return result;
+    if (isAttachment())
+    {
+        return false;
+    }
+
+    std::vector<LLBBox> boxes;
+    boxes.push_back(LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f).getAxisAligned());
+    for (child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        boxes.push_back( LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned());
+    }
+
+    bool result = (mRegionp && mRegionp->objectIsReturnable(getPositionRegion(), boxes)) ? 1 : 0;
+
+    if ( !result )
+    {
+        //Get list of neighboring regions relative to this vo's region
+        std::vector<LLViewerRegion*> uniqueRegions;
+        mRegionp->getNeighboringRegions( uniqueRegions );
+
+        //Build aabb's - for root and all children
+        std::vector<PotentialReturnableObject> returnables;
+        typedef std::vector<LLViewerRegion*>::iterator RegionIt;
+        RegionIt regionStart = uniqueRegions.begin();
+        RegionIt regionEnd   = uniqueRegions.end();
+
+        for (; regionStart != regionEnd; ++regionStart )
+        {
+            LLViewerRegion* pTargetRegion = *regionStart;
+            //Add the root vo as there may be no children and we still want
+            //to test for any edge overlap
+            buildReturnablesForChildrenVO( returnables, this, pTargetRegion );
+            //Add it's children
+            for (child_list_t::iterator iter = mChildList.begin();  iter != mChildList.end(); iter++)
+            {
+                LLViewerObject* pChild = *iter;
+                buildReturnablesForChildrenVO( returnables, pChild, pTargetRegion );
+            }
+        }
+
+        //TBD#Eventually create a region -> box list map
+        typedef std::vector<PotentialReturnableObject>::iterator ReturnablesIt;
+        ReturnablesIt retCurrentIt = returnables.begin();
+        ReturnablesIt retEndIt = returnables.end();
+
+        for ( ; retCurrentIt !=retEndIt; ++retCurrentIt )
+        {
+            boxes.clear();
+            LLViewerRegion* pRegion = (*retCurrentIt).pRegion;
+            boxes.push_back( (*retCurrentIt).box );
+            bool retResult =    pRegion
+                             && pRegion->childrenObjectReturnable( boxes )
+                             && pRegion->canManageEstate();
+            if ( retResult )
+            {
+                result = true;
+                break;
+            }
+        }
+    }
+    return result;
 }
 
 void LLViewerObject::buildReturnablesForChildrenVO( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion )
 {
-	if ( !pChild )
-	{
-		LL_ERRS()<<"child viewerobject is NULL "<<LL_ENDL;
-	}
-	
-	constructAndAddReturnable( returnables, pChild, pTargetRegion );
-	
-	//We want to handle any children VO's as well
-	for (child_list_t::iterator iter = pChild->mChildList.begin();  iter != pChild->mChildList.end(); iter++)
-	{
-		LLViewerObject* pChildofChild = *iter;
-		buildReturnablesForChildrenVO( returnables, pChildofChild, pTargetRegion );
-	}
+    if ( !pChild )
+    {
+        LL_ERRS()<<"child viewerobject is NULL "<<LL_ENDL;
+    }
+
+    constructAndAddReturnable( returnables, pChild, pTargetRegion );
+
+    //We want to handle any children VO's as well
+    for (child_list_t::iterator iter = pChild->mChildList.begin();  iter != pChild->mChildList.end(); iter++)
+    {
+        LLViewerObject* pChildofChild = *iter;
+        buildReturnablesForChildrenVO( returnables, pChildofChild, pTargetRegion );
+    }
 }
 
 void LLViewerObject::constructAndAddReturnable( std::vector<PotentialReturnableObject>& returnables, LLViewerObject* pChild, LLViewerRegion* pTargetRegion )
 {
-	
-	LLVector3 targetRegionPos;
-	targetRegionPos.setVec( pChild->getPositionGlobal() );	
-	
-	LLBBox childBBox = LLBBox( targetRegionPos, pChild->getRotationRegion(), pChild->getScale() * -0.5f, 
-							    pChild->getScale() * 0.5f).getAxisAligned();
-	
-	LLVector3 edgeA = targetRegionPos + childBBox.getMinLocal();
-	LLVector3 edgeB = targetRegionPos + childBBox.getMaxLocal();
-	
-	LLVector3d edgeAd, edgeBd;
-	edgeAd.setVec(edgeA);
-	edgeBd.setVec(edgeB);
-	
-	//Only add the box when either of the extents are in a neighboring region
-	if ( pTargetRegion->pointInRegionGlobal( edgeAd ) || pTargetRegion->pointInRegionGlobal( edgeBd ) )
-	{
-		PotentialReturnableObject returnableObj;
-		returnableObj.box		= childBBox;
-		returnableObj.pRegion	= pTargetRegion;
-		returnables.push_back( returnableObj );
-	}
+
+    LLVector3 targetRegionPos;
+    targetRegionPos.setVec( pChild->getPositionGlobal() );
+
+    LLBBox childBBox = LLBBox( targetRegionPos, pChild->getRotationRegion(), pChild->getScale() * -0.5f,
+                                pChild->getScale() * 0.5f).getAxisAligned();
+
+    LLVector3 edgeA = targetRegionPos + childBBox.getMinLocal();
+    LLVector3 edgeB = targetRegionPos + childBBox.getMaxLocal();
+
+    LLVector3d edgeAd, edgeBd;
+    edgeAd.setVec(edgeA);
+    edgeBd.setVec(edgeB);
+
+    //Only add the box when either of the extents are in a neighboring region
+    if ( pTargetRegion->pointInRegionGlobal( edgeAd ) || pTargetRegion->pointInRegionGlobal( edgeBd ) )
+    {
+        PotentialReturnableObject returnableObj;
+        returnableObj.box       = childBBox;
+        returnableObj.pRegion   = pTargetRegion;
+        returnables.push_back( returnableObj );
+    }
 }
 
 bool LLViewerObject::crossesParcelBounds()
 {
-	std::vector<LLBBox> boxes;
-	boxes.push_back(LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f).getAxisAligned());
-	for (child_list_t::iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* child = *iter;
-		boxes.push_back(LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned());
-	}
+    std::vector<LLBBox> boxes;
+    boxes.push_back(LLBBox(getPositionRegion(), getRotationRegion(), getScale() * -0.5f, getScale() * 0.5f).getAxisAligned());
+    for (child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        boxes.push_back(LLBBox(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f).getAxisAligned());
+    }
 
-	return mRegionp && mRegionp->objectsCrossParcel(boxes);
+    return mRegionp && mRegionp->objectsCrossParcel(boxes);
 }
 
 BOOL LLViewerObject::setParent(LLViewerObject* parent)
 {
-	if(mParent != parent)
-	{
-		LLViewerObject* old_parent = (LLViewerObject*)mParent ;		
-		BOOL ret = LLPrimitive::setParent(parent);
-		if(ret && old_parent && parent)
-		{
-			old_parent->removeChild(this) ;
-		}
-		return ret ;
-	}
+    if(mParent != parent)
+    {
+        LLViewerObject* old_parent = (LLViewerObject*)mParent ;
+        BOOL ret = LLPrimitive::setParent(parent);
+        if(ret && old_parent && parent)
+        {
+            old_parent->removeChild(this) ;
+        }
+        return ret ;
+    }
 
-	return FALSE ;
+    return FALSE ;
 }
 
 void LLViewerObject::addChild(LLViewerObject *childp)
 {
-	for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
-	{
-		if (*i == childp)
-		{	//already has child
-			return;
-		}
-	}
-	
-	if (!isAvatar())
-	{
-		// propagate selection properties
-		childp->mbCanSelect = mbCanSelect;
-	}
-
-	if(childp->setParent(this))
-	{
-		mChildList.push_back(childp);
-		childp->afterReparent();
-
-		if (childp->isAvatar())
-		{
-			mSeatCount++;
-		}
-	}
+    for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
+    {
+        if (*i == childp)
+        {   //already has child
+            return;
+        }
+    }
+
+    if (!isAvatar())
+    {
+        // propagate selection properties
+        childp->mbCanSelect = mbCanSelect;
+    }
+
+    if(childp->setParent(this))
+    {
+        mChildList.push_back(childp);
+        childp->afterReparent();
+
+        if (childp->isAvatar())
+        {
+            mSeatCount++;
+        }
+    }
 }
 
 void LLViewerObject::onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent)
@@ -954,149 +954,149 @@ void LLViewerObject::afterReparent()
 
 void LLViewerObject::removeChild(LLViewerObject *childp)
 {
-	for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
-	{
-		if (*i == childp)
-		{
-			if (!childp->isAvatar() && mDrawable.notNull() && mDrawable->isActive() && childp->mDrawable.notNull() && !isAvatar())
-			{
-				gPipeline.markRebuild(childp->mDrawable, LLDrawable::REBUILD_VOLUME);
-			}
-
-			mChildList.erase(i);
-
-			if(childp->getParent() == this)
-			{
-				childp->setParent(NULL);			
-			}
-
-			if (childp->isAvatar())
-			{
-				mSeatCount--;
-			}
-			break;
-		}
-	}
-	
-	if (childp->isSelected())
-	{
-		LLSelectMgr::getInstance()->deselectObjectAndFamily(childp);
-		BOOL add_to_end = TRUE;
-		LLSelectMgr::getInstance()->selectObjectAndFamily(childp, add_to_end);
-	}
+    for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
+    {
+        if (*i == childp)
+        {
+            if (!childp->isAvatar() && mDrawable.notNull() && mDrawable->isActive() && childp->mDrawable.notNull() && !isAvatar())
+            {
+                gPipeline.markRebuild(childp->mDrawable, LLDrawable::REBUILD_VOLUME);
+            }
+
+            mChildList.erase(i);
+
+            if(childp->getParent() == this)
+            {
+                childp->setParent(NULL);
+            }
+
+            if (childp->isAvatar())
+            {
+                mSeatCount--;
+            }
+            break;
+        }
+    }
+
+    if (childp->isSelected())
+    {
+        LLSelectMgr::getInstance()->deselectObjectAndFamily(childp);
+        BOOL add_to_end = TRUE;
+        LLSelectMgr::getInstance()->selectObjectAndFamily(childp, add_to_end);
+    }
 }
 
 void LLViewerObject::addThisAndAllChildren(std::vector<LLViewerObject*>& objects)
 {
-	objects.push_back(this);
-	for (child_list_t::iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* child = *iter;
-		if (!child->isAvatar())
-		{
-			child->addThisAndAllChildren(objects);
-		}
-	}
+    objects.push_back(this);
+    for (child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        if (!child->isAvatar())
+        {
+            child->addThisAndAllChildren(objects);
+        }
+    }
 }
 
 void LLViewerObject::addThisAndNonJointChildren(std::vector<LLViewerObject*>& objects)
 {
-	objects.push_back(this);
-	// don't add any attachments when temporarily selecting avatar
-	if (isAvatar())
-	{
-		return;
-	}
-	for (child_list_t::iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* child = *iter;
-		if ( (!child->isAvatar()))
-		{
-			child->addThisAndNonJointChildren(objects);
-		}
-	}
+    objects.push_back(this);
+    // don't add any attachments when temporarily selecting avatar
+    if (isAvatar())
+    {
+        return;
+    }
+    for (child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        if ( (!child->isAvatar()))
+        {
+            child->addThisAndNonJointChildren(objects);
+        }
+    }
 }
 
 BOOL LLViewerObject::isChild(LLViewerObject *childp) const
 {
-	for (child_list_t::const_iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* testchild = *iter;
-		if (testchild == childp)
-			return TRUE;
-	}
-	return FALSE;
+    for (child_list_t::const_iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* testchild = *iter;
+        if (testchild == childp)
+            return TRUE;
+    }
+    return FALSE;
 }
 
 // returns TRUE if at least one avatar is sitting on this object
 BOOL LLViewerObject::isSeat() const
 {
-	return mSeatCount > 0;
+    return mSeatCount > 0;
 }
 
 BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp)
 {
-	if (mDrawable.isNull())
-	{
-		return FALSE;
-	}
-
-	BOOL ret = mDrawable->mXform.setParent(parentp ? &parentp->mXform : NULL);
-	if(!ret)
-	{
-		return FALSE ;
-	}
-	LLDrawable* old_parent = mDrawable->mParent;
-	mDrawable->mParent = parentp; 
-		
-	if (parentp && mDrawable->isActive())
-	{
-		parentp->makeActive();
-		parentp->setState(LLDrawable::ACTIVE_CHILD);
-	}
-
-	gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME);
-	if(	(old_parent != parentp && old_parent)
-		|| (parentp && parentp->isActive()))
-	{
-		// *TODO we should not be relying on setDrawable parent to call markMoved
-		gPipeline.markMoved(mDrawable, FALSE);
-	}
-	else if (!mDrawable->isAvatar())
-	{
-		mDrawable->updateXform(TRUE);
-		/*if (!mDrawable->getSpatialGroup())
-		{
-			mDrawable->movePartition();
-		}*/
-	}
-	
-	return ret;
+    if (mDrawable.isNull())
+    {
+        return FALSE;
+    }
+
+    BOOL ret = mDrawable->mXform.setParent(parentp ? &parentp->mXform : NULL);
+    if(!ret)
+    {
+        return FALSE ;
+    }
+    LLDrawable* old_parent = mDrawable->mParent;
+    mDrawable->mParent = parentp;
+
+    if (parentp && mDrawable->isActive())
+    {
+        parentp->makeActive();
+        parentp->setState(LLDrawable::ACTIVE_CHILD);
+    }
+
+    gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME);
+    if( (old_parent != parentp && old_parent)
+        || (parentp && parentp->isActive()))
+    {
+        // *TODO we should not be relying on setDrawable parent to call markMoved
+        gPipeline.markMoved(mDrawable, FALSE);
+    }
+    else if (!mDrawable->isAvatar())
+    {
+        mDrawable->updateXform(TRUE);
+        /*if (!mDrawable->getSpatialGroup())
+        {
+            mDrawable->movePartition();
+        }*/
+    }
+
+    return ret;
 }
 
 // Show or hide particles, icon and HUD
 void LLViewerObject::hideExtraDisplayItems( BOOL hidden )
 {
-	if( mPartSourcep.notNull() )
-	{
-		LLViewerPartSourceScript *partSourceScript = mPartSourcep.get();
-		partSourceScript->setSuspended( hidden );
-	}
+    if( mPartSourcep.notNull() )
+    {
+        LLViewerPartSourceScript *partSourceScript = mPartSourcep.get();
+        partSourceScript->setSuspended( hidden );
+    }
 
-	if( mText.notNull() )
-	{
-		LLHUDText *hudText = mText.get();
-		hudText->setHidden( hidden );
-	}
+    if( mText.notNull() )
+    {
+        LLHUDText *hudText = mText.get();
+        hudText->setHidden( hidden );
+    }
 
-	if( mIcon.notNull() )
-	{
-		LLHUDIcon *hudIcon = mIcon.get();
-		hudIcon->setHidden( hidden );
-	}
+    if( mIcon.notNull() )
+    {
+        LLHUDIcon *hudIcon = mIcon.get();
+        hudIcon->setHidden( hidden );
+    }
 }
 
 U32 LLViewerObject::checkMediaURL(const std::string &media_url)
@@ -1121,9 +1121,9 @@ U32 LLViewerObject::checkMediaURL(const std::string &media_url)
         else if (mMedia->mMediaURL != media_url) // <-- This is an optimization.  If they are equal don't bother with below's test.
         {
             /*if (! (LLTextureEntry::getAgentIDFromMediaVersionString(media_url) == gAgent.getID() &&
-                   LLTextureEntry::getVersionFromMediaVersionString(media_url) == 
+                   LLTextureEntry::getVersionFromMediaVersionString(media_url) ==
                         LLTextureEntry::getVersionFromMediaVersionString(mMedia->mMediaURL) + 1))
-			*/
+            */
             {
                 // If the media URL is different and WE were not the one who
                 // changed it, mark dirty.
@@ -1141,1354 +1141,1354 @@ U32 LLViewerObject::checkMediaURL(const std::string &media_url)
 //static
 U32 LLViewerObject::extractSpatialExtents(LLDataPackerBinaryBuffer *dp, LLVector3& pos, LLVector3& scale, LLQuaternion& rot)
 {
-	U32	parent_id = 0;
-	LLViewerObject::unpackParentID(dp, parent_id);
+    U32 parent_id = 0;
+    LLViewerObject::unpackParentID(dp, parent_id);
+
+    LLViewerObject::unpackVector3(dp, scale, "Scale");
+    LLViewerObject::unpackVector3(dp, pos, "Pos");
+
+    LLVector3 vec;
+    LLViewerObject::unpackVector3(dp, vec, "Rot");
+    rot.unpackFromVector3(vec);
 
-	LLViewerObject::unpackVector3(dp, scale, "Scale");
-	LLViewerObject::unpackVector3(dp, pos, "Pos");
-	
-	LLVector3 vec;
-	LLViewerObject::unpackVector3(dp, vec, "Rot");
-	rot.unpackFromVector3(vec);
-	
-	return parent_id;
+    return parent_id;
 }
 
 U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
-					 void **user_data,
-					 U32 block_num,
-					 const EObjectUpdateType update_type,
-					 LLDataPacker *dp)
+                     void **user_data,
+                     U32 block_num,
+                     const EObjectUpdateType update_type,
+                     LLDataPacker *dp)
 {
     LL_PROFILE_ZONE_SCOPED;
-	LL_DEBUGS_ONCE("SceneLoadTiming") << "Received viewer object data" << LL_ENDL;
+    LL_DEBUGS_ONCE("SceneLoadTiming") << "Received viewer object data" << LL_ENDL;
 
     LL_DEBUGS("ObjectUpdate") << " mesgsys " << mesgsys << " dp " << dp << " id " << getID() << " update_type " << (S32) update_type << LL_ENDL;
     dumpStack("ObjectUpdateStack");
 
-	U32 retval = 0x0;
-	
-	// If region is removed from the list it is also deleted.
-	if (!LLWorld::instance().isRegionListed(mRegionp))
-	{
-		LL_WARNS() << "Updating object in an invalid region" << LL_ENDL;
-		return retval;
-	}
-
-	// Coordinates of objects on simulators are region-local.
-	U64 region_handle = 0;	
-	
-	if(mesgsys != NULL)
-	{
-		mesgsys->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
-		LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromHandle(region_handle);
-		if(regionp != mRegionp && regionp && mRegionp)//region cross
-		{
-			//this is the redundant position and region update, but it is necessary in case the viewer misses the following 
-			//position and region update messages from sim.
-			//this redundant update should not cause any problems.
-			LLVector3 delta_pos =  mRegionp->getOriginAgent() - regionp->getOriginAgent();
-			setPositionParent(getPosition() + delta_pos); //update to the new region position immediately.
-			setRegion(regionp) ; //change the region.
-		}
-		else
-		{
-			if(regionp != mRegionp)
-			{
-				if(mRegionp)
-				{
-					mRegionp->removeFromCreatedList(getLocalID()); 
-				}
-				if(regionp)
-				{
-					regionp->addToCreatedList(getLocalID()); 
-				}
-			}
-			mRegionp = regionp ;
-		}
-	}	
-	
-	if (!mRegionp)
-	{
-		U32 x, y;
-		from_region_handle(region_handle, &x, &y);
-
-		LL_ERRS() << "Object has invalid region " << x << ":" << y << "!" << LL_ENDL;
-		return retval;
-	}
-
-	F32 time_dilation = 1.f;
-	if(mesgsys != NULL)
-	{
+    U32 retval = 0x0;
+
+    // If region is removed from the list it is also deleted.
+    if (!LLWorld::instance().isRegionListed(mRegionp))
+    {
+        LL_WARNS() << "Updating object in an invalid region" << LL_ENDL;
+        return retval;
+    }
+
+    // Coordinates of objects on simulators are region-local.
+    U64 region_handle = 0;
+
+    if(mesgsys != NULL)
+    {
+        mesgsys->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
+        LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromHandle(region_handle);
+        if(regionp != mRegionp && regionp && mRegionp)//region cross
+        {
+            //this is the redundant position and region update, but it is necessary in case the viewer misses the following
+            //position and region update messages from sim.
+            //this redundant update should not cause any problems.
+            LLVector3 delta_pos =  mRegionp->getOriginAgent() - regionp->getOriginAgent();
+            setPositionParent(getPosition() + delta_pos); //update to the new region position immediately.
+            setRegion(regionp) ; //change the region.
+        }
+        else
+        {
+            if(regionp != mRegionp)
+            {
+                if(mRegionp)
+                {
+                    mRegionp->removeFromCreatedList(getLocalID());
+                }
+                if(regionp)
+                {
+                    regionp->addToCreatedList(getLocalID());
+                }
+            }
+            mRegionp = regionp ;
+        }
+    }
+
+    if (!mRegionp)
+    {
+        U32 x, y;
+        from_region_handle(region_handle, &x, &y);
+
+        LL_ERRS() << "Object has invalid region " << x << ":" << y << "!" << LL_ENDL;
+        return retval;
+    }
+
+    F32 time_dilation = 1.f;
+    if(mesgsys != NULL)
+    {
         U16 time_dilation16;
         mesgsys->getU16Fast(_PREHASH_RegionData, _PREHASH_TimeDilation, time_dilation16);
         time_dilation = ((F32) time_dilation16) / 65535.f;
         mRegionp->setTimeDilation(time_dilation);
-	}
+    }
 
-	// this will be used to determine if we've really changed position
-	// Use getPosition, not getPositionRegion, since this is what we're comparing directly against.
-	LLVector3 test_pos_parent = getPosition();
+    // this will be used to determine if we've really changed position
+    // Use getPosition, not getPositionRegion, since this is what we're comparing directly against.
+    LLVector3 test_pos_parent = getPosition();
 
-	// This needs to match the largest size below. See switch(length)
-	U8  data[MAX_OBJECT_BINARY_DATA_SIZE]; 
+    // This needs to match the largest size below. See switch(length)
+    U8  data[MAX_OBJECT_BINARY_DATA_SIZE];
 
 #ifdef LL_BIG_ENDIAN
-	U16 valswizzle[4];
+    U16 valswizzle[4];
 #endif
-	U16	*val;
-	const F32 size = LLWorld::getInstance()->getRegionWidthInMeters();	
-	const F32 MAX_HEIGHT = LLWorld::getInstance()->getRegionMaxHeight();
-	const F32 MIN_HEIGHT = LLWorld::getInstance()->getRegionMinHeight();
-	S32 length;
-	S32	count;
-	S32 this_update_precision = 32;		// in bits
-
-	// Temporaries, because we need to compare w/ previous to set dirty flags...
-	LLVector3 new_pos_parent;
-	LLVector3 new_vel;
-	LLVector3 new_acc;
-	LLVector3 new_angv;
-	LLVector3 old_angv = getAngularVelocity();
-	LLQuaternion new_rot;
-	LLVector3 new_scale = getScale();
-
-	U32	parent_id = 0;
-	U8	material = 0;
-	U8 click_action = 0;
-	U32 crc = 0;
-
-	bool old_special_hover_cursor = specialHoverCursor();
-
-	LLViewerObject *cur_parentp = (LLViewerObject *)getParent();
-
-	if (cur_parentp)
-	{
-		parent_id = cur_parentp->mLocalID;
-	}
-
-	if (!dp)
-	{
-		switch(update_type)
-		{
-		case OUT_FULL:
-			{
+    U16 *val;
+    const F32 size = LLWorld::getInstance()->getRegionWidthInMeters();
+    const F32 MAX_HEIGHT = LLWorld::getInstance()->getRegionMaxHeight();
+    const F32 MIN_HEIGHT = LLWorld::getInstance()->getRegionMinHeight();
+    S32 length;
+    S32 count;
+    S32 this_update_precision = 32;     // in bits
+
+    // Temporaries, because we need to compare w/ previous to set dirty flags...
+    LLVector3 new_pos_parent;
+    LLVector3 new_vel;
+    LLVector3 new_acc;
+    LLVector3 new_angv;
+    LLVector3 old_angv = getAngularVelocity();
+    LLQuaternion new_rot;
+    LLVector3 new_scale = getScale();
+
+    U32 parent_id = 0;
+    U8  material = 0;
+    U8 click_action = 0;
+    U32 crc = 0;
+
+    bool old_special_hover_cursor = specialHoverCursor();
+
+    LLViewerObject *cur_parentp = (LLViewerObject *)getParent();
+
+    if (cur_parentp)
+    {
+        parent_id = cur_parentp->mLocalID;
+    }
+
+    if (!dp)
+    {
+        switch(update_type)
+        {
+        case OUT_FULL:
+            {
 #ifdef DEBUG_UPDATE_TYPE
-				LL_INFOS() << "Full:" << getID() << LL_ENDL;
+                LL_INFOS() << "Full:" << getID() << LL_ENDL;
 #endif
-				//clear cost and linkset cost
-				setObjectCostStale();
-				if (isSelected())
-				{
-					gFloaterTools->dirty();
-				}
-
-				LLUUID audio_uuid;
-				LLUUID owner_id;	// only valid if audio_uuid or particle system is not null
-				F32    gain;
-				F32    cutoff;
-				U8     sound_flags;
-
-				mesgsys->getU32Fast( _PREHASH_ObjectData, _PREHASH_CRC, crc, block_num);
-				mesgsys->getU32Fast( _PREHASH_ObjectData, _PREHASH_ParentID, parent_id, block_num);
-				mesgsys->getUUIDFast(_PREHASH_ObjectData, _PREHASH_Sound, audio_uuid, block_num );
-				// HACK: Owner id only valid if non-null sound id or particle system
-				mesgsys->getUUIDFast(_PREHASH_ObjectData, _PREHASH_OwnerID, owner_id, block_num );
-				mesgsys->getF32Fast( _PREHASH_ObjectData, _PREHASH_Gain, gain, block_num );
-				mesgsys->getF32Fast(  _PREHASH_ObjectData, _PREHASH_Radius, cutoff, block_num );
-				mesgsys->getU8Fast(  _PREHASH_ObjectData, _PREHASH_Flags, sound_flags, block_num );
-				mesgsys->getU8Fast(  _PREHASH_ObjectData, _PREHASH_Material, material, block_num );
-				mesgsys->getU8Fast(  _PREHASH_ObjectData, _PREHASH_ClickAction, click_action, block_num); 
-				mesgsys->getVector3Fast(_PREHASH_ObjectData, _PREHASH_Scale, new_scale, block_num );
-				length = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_ObjectData);
-				mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_ObjectData, data, length, block_num, MAX_OBJECT_BINARY_DATA_SIZE);
-
-				mTotalCRC = crc;
+                //clear cost and linkset cost
+                setObjectCostStale();
+                if (isSelected())
+                {
+                    gFloaterTools->dirty();
+                }
+
+                LLUUID audio_uuid;
+                LLUUID owner_id;    // only valid if audio_uuid or particle system is not null
+                F32    gain;
+                F32    cutoff;
+                U8     sound_flags;
+
+                mesgsys->getU32Fast( _PREHASH_ObjectData, _PREHASH_CRC, crc, block_num);
+                mesgsys->getU32Fast( _PREHASH_ObjectData, _PREHASH_ParentID, parent_id, block_num);
+                mesgsys->getUUIDFast(_PREHASH_ObjectData, _PREHASH_Sound, audio_uuid, block_num );
+                // HACK: Owner id only valid if non-null sound id or particle system
+                mesgsys->getUUIDFast(_PREHASH_ObjectData, _PREHASH_OwnerID, owner_id, block_num );
+                mesgsys->getF32Fast( _PREHASH_ObjectData, _PREHASH_Gain, gain, block_num );
+                mesgsys->getF32Fast(  _PREHASH_ObjectData, _PREHASH_Radius, cutoff, block_num );
+                mesgsys->getU8Fast(  _PREHASH_ObjectData, _PREHASH_Flags, sound_flags, block_num );
+                mesgsys->getU8Fast(  _PREHASH_ObjectData, _PREHASH_Material, material, block_num );
+                mesgsys->getU8Fast(  _PREHASH_ObjectData, _PREHASH_ClickAction, click_action, block_num);
+                mesgsys->getVector3Fast(_PREHASH_ObjectData, _PREHASH_Scale, new_scale, block_num );
+                length = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_ObjectData);
+                mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_ObjectData, data, length, block_num, MAX_OBJECT_BINARY_DATA_SIZE);
+
+                mTotalCRC = crc;
                 // Might need to update mSourceMuted here to properly pick up new radius
-				mSoundCutOffRadius = cutoff;
-
-				// Owner ID used for sound muting or particle system muting
-				setAttachedSound(audio_uuid, owner_id, gain, sound_flags);
-
-				U8 old_material = getMaterial();
-				if (old_material != material)
-				{
-					setMaterial(material);
-					if (mDrawable.notNull())
-					{
-						gPipeline.markMoved(mDrawable, FALSE); // undamped
-					}
-				}
-				setClickAction(click_action);
-
-				count = 0;
-				LLVector4 collision_plane;
-				
-				switch(length)
-				{
-				case (60 + 16):
-					// pull out collision normal for avatar
-					htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
-					((LLVOAvatar*)this)->setFootPlane(collision_plane);
-					count += sizeof(LLVector4);
-					// fall through
-				case 60:
-					this_update_precision = 32;
-					// this is a terse update
-					// pos
-					htolememcpy(new_pos_parent.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					count += sizeof(LLVector3);
-					// vel
-					htolememcpy((void*)getVelocity().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					count += sizeof(LLVector3);
-					// acc
-					htolememcpy((void*)getAcceleration().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					count += sizeof(LLVector3);
-					// theta
-					{
-						LLVector3 vec;
-						htolememcpy(vec.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-						new_rot.unpackFromVector3(vec);
-					}
-					count += sizeof(LLVector3);
-					// omega
-					htolememcpy((void*)new_angv.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					if (new_angv.isExactlyZero())
-					{
-						// reset rotation time
-						resetRot();
-					}
-					setAngularVelocity(new_angv);
+                mSoundCutOffRadius = cutoff;
+
+                // Owner ID used for sound muting or particle system muting
+                setAttachedSound(audio_uuid, owner_id, gain, sound_flags);
+
+                U8 old_material = getMaterial();
+                if (old_material != material)
+                {
+                    setMaterial(material);
+                    if (mDrawable.notNull())
+                    {
+                        gPipeline.markMoved(mDrawable, FALSE); // undamped
+                    }
+                }
+                setClickAction(click_action);
+
+                count = 0;
+                LLVector4 collision_plane;
+
+                switch(length)
+                {
+                case (60 + 16):
+                    // pull out collision normal for avatar
+                    htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
+                    ((LLVOAvatar*)this)->setFootPlane(collision_plane);
+                    count += sizeof(LLVector4);
+                    // fall through
+                case 60:
+                    this_update_precision = 32;
+                    // this is a terse update
+                    // pos
+                    htolememcpy(new_pos_parent.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    count += sizeof(LLVector3);
+                    // vel
+                    htolememcpy((void*)getVelocity().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    count += sizeof(LLVector3);
+                    // acc
+                    htolememcpy((void*)getAcceleration().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    count += sizeof(LLVector3);
+                    // theta
+                    {
+                        LLVector3 vec;
+                        htolememcpy(vec.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                        new_rot.unpackFromVector3(vec);
+                    }
+                    count += sizeof(LLVector3);
+                    // omega
+                    htolememcpy((void*)new_angv.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    if (new_angv.isExactlyZero())
+                    {
+                        // reset rotation time
+                        resetRot();
+                    }
+                    setAngularVelocity(new_angv);
 #if LL_DARWIN
-					if (length == 76)
-					{
-						setAngularVelocity(LLVector3::zero);
-					}
+                    if (length == 76)
+                    {
+                        setAngularVelocity(LLVector3::zero);
+                    }
 #endif
-					break;
-				case(32 + 16):
-					// pull out collision normal for avatar
-					htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
-					((LLVOAvatar*)this)->setFootPlane(collision_plane);
-					count += sizeof(LLVector4);
-					// fall through
-				case 32:
-					this_update_precision = 16;
-					test_pos_parent.quantize16(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
-
-					// This is a terse 16 update, so treat data as an array of U16's.
+                    break;
+                case(32 + 16):
+                    // pull out collision normal for avatar
+                    htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
+                    ((LLVOAvatar*)this)->setFootPlane(collision_plane);
+                    count += sizeof(LLVector4);
+                    // fall through
+                case 32:
+                    this_update_precision = 16;
+                    test_pos_parent.quantize16(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
+
+                    // This is a terse 16 update, so treat data as an array of U16's.
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*3;
-					new_pos_parent.mV[VX] = U16_to_F32(val[VX], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VY] = U16_to_F32(val[VY], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VZ] = U16_to_F32(val[VZ], MIN_HEIGHT, MAX_HEIGHT);
+                    count += sizeof(U16)*3;
+                    new_pos_parent.mV[VX] = U16_to_F32(val[VX], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VY] = U16_to_F32(val[VY], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VZ] = U16_to_F32(val[VZ], MIN_HEIGHT, MAX_HEIGHT);
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*3;
-					setVelocity(LLVector3(U16_to_F32(val[VX], -size, size),
-													   U16_to_F32(val[VY], -size, size),
-													   U16_to_F32(val[VZ], -size, size)));
+                    count += sizeof(U16)*3;
+                    setVelocity(LLVector3(U16_to_F32(val[VX], -size, size),
+                                                       U16_to_F32(val[VY], -size, size),
+                                                       U16_to_F32(val[VZ], -size, size)));
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*3;
-					setAcceleration(LLVector3(U16_to_F32(val[VX], -size, size),
-														   U16_to_F32(val[VY], -size, size),
-														   U16_to_F32(val[VZ], -size, size)));
+                    count += sizeof(U16)*3;
+                    setAcceleration(LLVector3(U16_to_F32(val[VX], -size, size),
+                                                           U16_to_F32(val[VY], -size, size),
+                                                           U16_to_F32(val[VZ], -size, size)));
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Quat, 4); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Quat, 4);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*4;
-					new_rot.mQ[VX] = U16_to_F32(val[VX], -1.f, 1.f);
-					new_rot.mQ[VY] = U16_to_F32(val[VY], -1.f, 1.f);
-					new_rot.mQ[VZ] = U16_to_F32(val[VZ], -1.f, 1.f);
-					new_rot.mQ[VW] = U16_to_F32(val[VW], -1.f, 1.f);
+                    count += sizeof(U16)*4;
+                    new_rot.mQ[VX] = U16_to_F32(val[VX], -1.f, 1.f);
+                    new_rot.mQ[VY] = U16_to_F32(val[VY], -1.f, 1.f);
+                    new_rot.mQ[VZ] = U16_to_F32(val[VZ], -1.f, 1.f);
+                    new_rot.mQ[VW] = U16_to_F32(val[VW], -1.f, 1.f);
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					new_angv.setVec(U16_to_F32(val[VX], -size, size),
-										U16_to_F32(val[VY], -size, size),
-										U16_to_F32(val[VZ], -size, size));
-					if (new_angv.isExactlyZero())
-					{
-						// reset rotation time
-						resetRot();
-					}
-					setAngularVelocity(new_angv);
-					break;
-
-				case 16:
-					this_update_precision = 8;
-					test_pos_parent.quantize8(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
-					// this is a terse 8 update
-					new_pos_parent.mV[VX] = U8_to_F32(data[0], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VY] = U8_to_F32(data[1], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VZ] = U8_to_F32(data[2], MIN_HEIGHT, MAX_HEIGHT);
-
-					setVelocity(U8_to_F32(data[3], -size, size),
-								U8_to_F32(data[4], -size, size),
-								U8_to_F32(data[5], -size, size) );
-
-					setAcceleration(U8_to_F32(data[6], -size, size),
-									U8_to_F32(data[7], -size, size),
-									U8_to_F32(data[8], -size, size) );
-
-					new_rot.mQ[VX] = U8_to_F32(data[9], -1.f, 1.f);
-					new_rot.mQ[VY] = U8_to_F32(data[10], -1.f, 1.f);
-					new_rot.mQ[VZ] = U8_to_F32(data[11], -1.f, 1.f);
-					new_rot.mQ[VW] = U8_to_F32(data[12], -1.f, 1.f);
-
-					new_angv.setVec(U8_to_F32(data[13], -size, size),
-										U8_to_F32(data[14], -size, size),
-										U8_to_F32(data[15], -size, size) );
-					if (new_angv.isExactlyZero())
-					{
-						// reset rotation time
-						resetRot();
-					}
-					setAngularVelocity(new_angv);
-					break;
-				}
-
-				////////////////////////////////////////////////////
-				//
-				// Here we handle data specific to the full message.
-				//
-
-				U32 flags;
-				mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, block_num);
-				// clear all but local flags
-				mFlags &= FLAGS_LOCAL;
-				mFlags |= flags;
-
-				U8 state;
-				mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_State, state, block_num );
-				mAttachmentState = state;
-
-				// ...new objects that should come in selected need to be added to the selected list
-				mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
-
-				// Set all name value pairs
-				S32 nv_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_NameValue);
-				if (nv_size > 0)
-				{
-					std::string name_value_list;
-					mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_NameValue, name_value_list, block_num);
-					setNameValueList(name_value_list);
-				}
-
-				// Clear out any existing generic data
-				if (mData)
-				{
-					delete [] mData;
-				}
-
-				// Check for appended generic data
-				S32 data_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Data);
-				if (data_size <= 0)
-				{
-					mData = NULL;
-				}
-				else
-				{
-					// ...has generic data
-					mData = new U8[data_size];
-					mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, mData, data_size, block_num);
-				}
-
-				S32 text_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Text);
-				if (text_size > 1)
-				{
-					// Setup object text
-					if (!mText)
-					{
-					    initHudText();
-					}
-
-					std::string temp_string;
-					mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, temp_string, block_num );
-					
-					LLColor4U coloru;
-					mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextColor, coloru.mV, 4, block_num);
-
-					// alpha was flipped so that it zero encoded better
-					coloru.mV[3] = 255 - coloru.mV[3];
-					mText->setColor(LLColor4(coloru));
-					mText->setString(temp_string);
-
-					mHudText = temp_string;
-					mHudTextColor = LLColor4(coloru);
-
-					setChanged(MOVED | SILHOUETTE);
-				}
-				else
-				{
-					if (mText.notNull())
-					{
-						mText->markDead();
-						mText = NULL;
-					}
-					mHudText.clear();
-				}
-
-				std::string media_url;
-				mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, media_url, block_num);
+                    new_angv.setVec(U16_to_F32(val[VX], -size, size),
+                                        U16_to_F32(val[VY], -size, size),
+                                        U16_to_F32(val[VZ], -size, size));
+                    if (new_angv.isExactlyZero())
+                    {
+                        // reset rotation time
+                        resetRot();
+                    }
+                    setAngularVelocity(new_angv);
+                    break;
+
+                case 16:
+                    this_update_precision = 8;
+                    test_pos_parent.quantize8(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
+                    // this is a terse 8 update
+                    new_pos_parent.mV[VX] = U8_to_F32(data[0], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VY] = U8_to_F32(data[1], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VZ] = U8_to_F32(data[2], MIN_HEIGHT, MAX_HEIGHT);
+
+                    setVelocity(U8_to_F32(data[3], -size, size),
+                                U8_to_F32(data[4], -size, size),
+                                U8_to_F32(data[5], -size, size) );
+
+                    setAcceleration(U8_to_F32(data[6], -size, size),
+                                    U8_to_F32(data[7], -size, size),
+                                    U8_to_F32(data[8], -size, size) );
+
+                    new_rot.mQ[VX] = U8_to_F32(data[9], -1.f, 1.f);
+                    new_rot.mQ[VY] = U8_to_F32(data[10], -1.f, 1.f);
+                    new_rot.mQ[VZ] = U8_to_F32(data[11], -1.f, 1.f);
+                    new_rot.mQ[VW] = U8_to_F32(data[12], -1.f, 1.f);
+
+                    new_angv.setVec(U8_to_F32(data[13], -size, size),
+                                        U8_to_F32(data[14], -size, size),
+                                        U8_to_F32(data[15], -size, size) );
+                    if (new_angv.isExactlyZero())
+                    {
+                        // reset rotation time
+                        resetRot();
+                    }
+                    setAngularVelocity(new_angv);
+                    break;
+                }
+
+                ////////////////////////////////////////////////////
+                //
+                // Here we handle data specific to the full message.
+                //
+
+                U32 flags;
+                mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, block_num);
+                // clear all but local flags
+                mFlags &= FLAGS_LOCAL;
+                mFlags |= flags;
+
+                U8 state;
+                mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_State, state, block_num );
+                mAttachmentState = state;
+
+                // ...new objects that should come in selected need to be added to the selected list
+                mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
+
+                // Set all name value pairs
+                S32 nv_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_NameValue);
+                if (nv_size > 0)
+                {
+                    std::string name_value_list;
+                    mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_NameValue, name_value_list, block_num);
+                    setNameValueList(name_value_list);
+                }
+
+                // Clear out any existing generic data
+                if (mData)
+                {
+                    delete [] mData;
+                }
+
+                // Check for appended generic data
+                S32 data_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Data);
+                if (data_size <= 0)
+                {
+                    mData = NULL;
+                }
+                else
+                {
+                    // ...has generic data
+                    mData = new U8[data_size];
+                    mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, mData, data_size, block_num);
+                }
+
+                S32 text_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Text);
+                if (text_size > 1)
+                {
+                    // Setup object text
+                    if (!mText)
+                    {
+                        initHudText();
+                    }
+
+                    std::string temp_string;
+                    mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, temp_string, block_num );
+
+                    LLColor4U coloru;
+                    mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextColor, coloru.mV, 4, block_num);
+
+                    // alpha was flipped so that it zero encoded better
+                    coloru.mV[3] = 255 - coloru.mV[3];
+                    mText->setColor(LLColor4(coloru));
+                    mText->setString(temp_string);
+
+                    mHudText = temp_string;
+                    mHudTextColor = LLColor4(coloru);
+
+                    setChanged(MOVED | SILHOUETTE);
+                }
+                else
+                {
+                    if (mText.notNull())
+                    {
+                        mText->markDead();
+                        mText = NULL;
+                    }
+                    mHudText.clear();
+                }
+
+                std::string media_url;
+                mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, media_url, block_num);
                 retval |= checkMediaURL(media_url);
-                
-				//
-				// Unpack particle system data
-				//
-				unpackParticleSource(block_num, owner_id);
-
-				// Mark all extra parameters not used
-				std::unordered_map<U16, ExtraParameter*>::iterator iter;
-				for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
-				{
-					iter->second->in_use = FALSE;
-				}
-
-				// Unpack extra parameters
-				S32 size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_ExtraParams);
-				if (size > 0)
-				{
-					U8 *buffer = new U8[size];
-					mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_ExtraParams, buffer, size, block_num);
-					LLDataPackerBinaryBuffer dp(buffer, size);
-
-					U8 num_parameters;
-					dp.unpackU8(num_parameters, "num_params");
-					U8 param_block[MAX_OBJECT_PARAMS_SIZE];
-					for (U8 param=0; param<num_parameters; ++param)
-					{
-						U16 param_type;
-						S32 param_size;
-						dp.unpackU16(param_type, "param_type");
-						dp.unpackBinaryData(param_block, param_size, "param_data");
-						//LL_INFOS() << "Param type: " << param_type << ", Size: " << param_size << LL_ENDL;
-						LLDataPackerBinaryBuffer dp2(param_block, param_size);
-						unpackParameterEntry(param_type, &dp2);
-					}
-					delete[] buffer;
-				}
-
-				for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
-				{
-					if (!iter->second->in_use)
-					{
-						// Send an update message in case it was formerly in use
-						parameterChanged(iter->first, iter->second->data, FALSE, false);
-					}
-				}
-
-				break;
-			}
-
-		case OUT_TERSE_IMPROVED:
-			{
+
+                //
+                // Unpack particle system data
+                //
+                unpackParticleSource(block_num, owner_id);
+
+                // Mark all extra parameters not used
+                std::unordered_map<U16, ExtraParameter*>::iterator iter;
+                for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
+                {
+                    iter->second->in_use = FALSE;
+                }
+
+                // Unpack extra parameters
+                S32 size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_ExtraParams);
+                if (size > 0)
+                {
+                    U8 *buffer = new U8[size];
+                    mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_ExtraParams, buffer, size, block_num);
+                    LLDataPackerBinaryBuffer dp(buffer, size);
+
+                    U8 num_parameters;
+                    dp.unpackU8(num_parameters, "num_params");
+                    U8 param_block[MAX_OBJECT_PARAMS_SIZE];
+                    for (U8 param=0; param<num_parameters; ++param)
+                    {
+                        U16 param_type;
+                        S32 param_size;
+                        dp.unpackU16(param_type, "param_type");
+                        dp.unpackBinaryData(param_block, param_size, "param_data");
+                        //LL_INFOS() << "Param type: " << param_type << ", Size: " << param_size << LL_ENDL;
+                        LLDataPackerBinaryBuffer dp2(param_block, param_size);
+                        unpackParameterEntry(param_type, &dp2);
+                    }
+                    delete[] buffer;
+                }
+
+                for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
+                {
+                    if (!iter->second->in_use)
+                    {
+                        // Send an update message in case it was formerly in use
+                        parameterChanged(iter->first, iter->second->data, FALSE, false);
+                    }
+                }
+
+                break;
+            }
+
+        case OUT_TERSE_IMPROVED:
+            {
 #ifdef DEBUG_UPDATE_TYPE
-				LL_INFOS() << "TI:" << getID() << LL_ENDL;
+                LL_INFOS() << "TI:" << getID() << LL_ENDL;
 #endif
-				length = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_ObjectData);
-				mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_ObjectData, data, length, block_num, MAX_OBJECT_BINARY_DATA_SIZE);
-				count = 0;
-				LLVector4 collision_plane;
-				
-				switch(length)
-				{
-				case(60 + 16):
-					// pull out collision normal for avatar
-					htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
-					((LLVOAvatar*)this)->setFootPlane(collision_plane);
-					count += sizeof(LLVector4);
-					// fall through
-				case 60:
-					// this is a terse 32 update
-					// pos
-					this_update_precision = 32;
-					htolememcpy(new_pos_parent.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					count += sizeof(LLVector3);
-					// vel
-					htolememcpy((void*)getVelocity().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					count += sizeof(LLVector3);
-					// acc
-					htolememcpy((void*)getAcceleration().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					count += sizeof(LLVector3);
-					// theta
-					{
-						LLVector3 vec;
-						htolememcpy(vec.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-						new_rot.unpackFromVector3(vec);
-					}
-					count += sizeof(LLVector3);
-					// omega
-					htolememcpy((void*)new_angv.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
-					if (new_angv.isExactlyZero())
-					{
-						// reset rotation time
-						resetRot();
-					}
-					setAngularVelocity(new_angv);
+                length = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_ObjectData);
+                mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_ObjectData, data, length, block_num, MAX_OBJECT_BINARY_DATA_SIZE);
+                count = 0;
+                LLVector4 collision_plane;
+
+                switch(length)
+                {
+                case(60 + 16):
+                    // pull out collision normal for avatar
+                    htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
+                    ((LLVOAvatar*)this)->setFootPlane(collision_plane);
+                    count += sizeof(LLVector4);
+                    // fall through
+                case 60:
+                    // this is a terse 32 update
+                    // pos
+                    this_update_precision = 32;
+                    htolememcpy(new_pos_parent.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    count += sizeof(LLVector3);
+                    // vel
+                    htolememcpy((void*)getVelocity().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    count += sizeof(LLVector3);
+                    // acc
+                    htolememcpy((void*)getAcceleration().mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    count += sizeof(LLVector3);
+                    // theta
+                    {
+                        LLVector3 vec;
+                        htolememcpy(vec.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                        new_rot.unpackFromVector3(vec);
+                    }
+                    count += sizeof(LLVector3);
+                    // omega
+                    htolememcpy((void*)new_angv.mV, &data[count], MVT_LLVector3, sizeof(LLVector3));
+                    if (new_angv.isExactlyZero())
+                    {
+                        // reset rotation time
+                        resetRot();
+                    }
+                    setAngularVelocity(new_angv);
 #if LL_DARWIN
-					if (length == 76)
-					{
-						setAngularVelocity(LLVector3::zero);
-					}
+                    if (length == 76)
+                    {
+                        setAngularVelocity(LLVector3::zero);
+                    }
 #endif
-					break;
-				case(32 + 16):
-					// pull out collision normal for avatar
-					htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
-					((LLVOAvatar*)this)->setFootPlane(collision_plane);
-					count += sizeof(LLVector4);
-					// fall through
-				case 32:
-					// this is a terse 16 update
-					this_update_precision = 16;
-					test_pos_parent.quantize16(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
+                    break;
+                case(32 + 16):
+                    // pull out collision normal for avatar
+                    htolememcpy(collision_plane.mV, &data[count], MVT_LLVector4, sizeof(LLVector4));
+                    ((LLVOAvatar*)this)->setFootPlane(collision_plane);
+                    count += sizeof(LLVector4);
+                    // fall through
+                case 32:
+                    // this is a terse 16 update
+                    this_update_precision = 16;
+                    test_pos_parent.quantize16(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*3;
-					new_pos_parent.mV[VX] = U16_to_F32(val[VX], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VY] = U16_to_F32(val[VY], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VZ] = U16_to_F32(val[VZ], MIN_HEIGHT, MAX_HEIGHT);
+                    count += sizeof(U16)*3;
+                    new_pos_parent.mV[VX] = U16_to_F32(val[VX], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VY] = U16_to_F32(val[VY], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VZ] = U16_to_F32(val[VZ], MIN_HEIGHT, MAX_HEIGHT);
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*3;
-					setVelocity(U16_to_F32(val[VX], -size, size),
-								U16_to_F32(val[VY], -size, size),
-								U16_to_F32(val[VZ], -size, size));
+                    count += sizeof(U16)*3;
+                    setVelocity(U16_to_F32(val[VX], -size, size),
+                                U16_to_F32(val[VY], -size, size),
+                                U16_to_F32(val[VZ], -size, size));
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*3;
-					setAcceleration(U16_to_F32(val[VX], -size, size),
-									U16_to_F32(val[VY], -size, size),
-									U16_to_F32(val[VZ], -size, size));
+                    count += sizeof(U16)*3;
+                    setAcceleration(U16_to_F32(val[VX], -size, size),
+                                    U16_to_F32(val[VY], -size, size),
+                                    U16_to_F32(val[VZ], -size, size));
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Quat, 8); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Quat, 8);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					count += sizeof(U16)*4;
-					new_rot.mQ[VX] = U16_to_F32(val[VX], -1.f, 1.f);
-					new_rot.mQ[VY] = U16_to_F32(val[VY], -1.f, 1.f);
-					new_rot.mQ[VZ] = U16_to_F32(val[VZ], -1.f, 1.f);
-					new_rot.mQ[VW] = U16_to_F32(val[VW], -1.f, 1.f);
+                    count += sizeof(U16)*4;
+                    new_rot.mQ[VX] = U16_to_F32(val[VX], -1.f, 1.f);
+                    new_rot.mQ[VY] = U16_to_F32(val[VY], -1.f, 1.f);
+                    new_rot.mQ[VZ] = U16_to_F32(val[VZ], -1.f, 1.f);
+                    new_rot.mQ[VW] = U16_to_F32(val[VW], -1.f, 1.f);
 
 #ifdef LL_BIG_ENDIAN
-					htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6); 
-					val = valswizzle;
+                    htolememcpy(valswizzle, &data[count], MVT_U16Vec3, 6);
+                    val = valswizzle;
 #else
-					val = (U16 *) &data[count];
+                    val = (U16 *) &data[count];
 #endif
-					new_angv.set(U16_to_F32(val[VX], -size, size),
-										U16_to_F32(val[VY], -size, size),
-										U16_to_F32(val[VZ], -size, size));
-					setAngularVelocity(new_angv);
-					break;
-
-				case 16:
-					// this is a terse 8 update
-					this_update_precision = 8;
-					test_pos_parent.quantize8(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
-					new_pos_parent.mV[VX] = U8_to_F32(data[0], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VY] = U8_to_F32(data[1], -0.5f*size, 1.5f*size);
-					new_pos_parent.mV[VZ] = U8_to_F32(data[2], MIN_HEIGHT, MAX_HEIGHT);
-
-					setVelocity(U8_to_F32(data[3], -size, size),
-								U8_to_F32(data[4], -size, size),
-								U8_to_F32(data[5], -size, size) );
-
-					setAcceleration(U8_to_F32(data[6], -size, size),
-									U8_to_F32(data[7], -size, size),
-									U8_to_F32(data[8], -size, size) );
-
-					new_rot.mQ[VX] = U8_to_F32(data[9], -1.f, 1.f);
-					new_rot.mQ[VY] = U8_to_F32(data[10], -1.f, 1.f);
-					new_rot.mQ[VZ] = U8_to_F32(data[11], -1.f, 1.f);
-					new_rot.mQ[VW] = U8_to_F32(data[12], -1.f, 1.f);
-
-					new_angv.set(U8_to_F32(data[13], -size, size),
-										U8_to_F32(data[14], -size, size),
-										U8_to_F32(data[15], -size, size) );
-					setAngularVelocity(new_angv);
-					break;
-				}
-
-				U8 state;
-				mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_State, state, block_num );
-				mAttachmentState = state;
-				break;
-			}
-
-		default:
-			break;
-
-		}
-	}
-	else
-	{
-		// handle the compressed case
-		LLUUID sound_uuid;
-		LLUUID	owner_id;
-		F32    gain = 0;
-		U8     sound_flags = 0;
-		F32		cutoff = 0;
-
-		U16 val[4];
-
-		U8		state;
-
-		dp->unpackU8(state, "State");
-		mAttachmentState = state;
-
-		switch(update_type)
-		{
-			case OUT_TERSE_IMPROVED:
-			{
+                    new_angv.set(U16_to_F32(val[VX], -size, size),
+                                        U16_to_F32(val[VY], -size, size),
+                                        U16_to_F32(val[VZ], -size, size));
+                    setAngularVelocity(new_angv);
+                    break;
+
+                case 16:
+                    // this is a terse 8 update
+                    this_update_precision = 8;
+                    test_pos_parent.quantize8(-0.5f*size, 1.5f*size, MIN_HEIGHT, MAX_HEIGHT);
+                    new_pos_parent.mV[VX] = U8_to_F32(data[0], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VY] = U8_to_F32(data[1], -0.5f*size, 1.5f*size);
+                    new_pos_parent.mV[VZ] = U8_to_F32(data[2], MIN_HEIGHT, MAX_HEIGHT);
+
+                    setVelocity(U8_to_F32(data[3], -size, size),
+                                U8_to_F32(data[4], -size, size),
+                                U8_to_F32(data[5], -size, size) );
+
+                    setAcceleration(U8_to_F32(data[6], -size, size),
+                                    U8_to_F32(data[7], -size, size),
+                                    U8_to_F32(data[8], -size, size) );
+
+                    new_rot.mQ[VX] = U8_to_F32(data[9], -1.f, 1.f);
+                    new_rot.mQ[VY] = U8_to_F32(data[10], -1.f, 1.f);
+                    new_rot.mQ[VZ] = U8_to_F32(data[11], -1.f, 1.f);
+                    new_rot.mQ[VW] = U8_to_F32(data[12], -1.f, 1.f);
+
+                    new_angv.set(U8_to_F32(data[13], -size, size),
+                                        U8_to_F32(data[14], -size, size),
+                                        U8_to_F32(data[15], -size, size) );
+                    setAngularVelocity(new_angv);
+                    break;
+                }
+
+                U8 state;
+                mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_State, state, block_num );
+                mAttachmentState = state;
+                break;
+            }
+
+        default:
+            break;
+
+        }
+    }
+    else
+    {
+        // handle the compressed case
+        LLUUID sound_uuid;
+        LLUUID  owner_id;
+        F32    gain = 0;
+        U8     sound_flags = 0;
+        F32     cutoff = 0;
+
+        U16 val[4];
+
+        U8      state;
+
+        dp->unpackU8(state, "State");
+        mAttachmentState = state;
+
+        switch(update_type)
+        {
+            case OUT_TERSE_IMPROVED:
+            {
 #ifdef DEBUG_UPDATE_TYPE
-				LL_INFOS() << "CompTI:" << getID() << LL_ENDL;
+                LL_INFOS() << "CompTI:" << getID() << LL_ENDL;
 #endif
-				U8		value;
-				dp->unpackU8(value, "agent");
-				if (value)
-				{
-					LLVector4 collision_plane;
-					dp->unpackVector4(collision_plane, "Plane");
-					((LLVOAvatar*)this)->setFootPlane(collision_plane);
-				}
-				test_pos_parent = getPosition();
-				dp->unpackVector3(new_pos_parent, "Pos");
-				dp->unpackU16(val[VX], "VelX");
-				dp->unpackU16(val[VY], "VelY");
-				dp->unpackU16(val[VZ], "VelZ");
-				setVelocity(U16_to_F32(val[VX], -128.f, 128.f),
-							U16_to_F32(val[VY], -128.f, 128.f),
-							U16_to_F32(val[VZ], -128.f, 128.f));
-				dp->unpackU16(val[VX], "AccX");
-				dp->unpackU16(val[VY], "AccY");
-				dp->unpackU16(val[VZ], "AccZ");
-				setAcceleration(U16_to_F32(val[VX], -64.f, 64.f),
-								U16_to_F32(val[VY], -64.f, 64.f),
-								U16_to_F32(val[VZ], -64.f, 64.f));
-
-				dp->unpackU16(val[VX], "ThetaX");
-				dp->unpackU16(val[VY], "ThetaY");
-				dp->unpackU16(val[VZ], "ThetaZ");
-				dp->unpackU16(val[VS], "ThetaS");
-				new_rot.mQ[VX] = U16_to_F32(val[VX], -1.f, 1.f);
-				new_rot.mQ[VY] = U16_to_F32(val[VY], -1.f, 1.f);
-				new_rot.mQ[VZ] = U16_to_F32(val[VZ], -1.f, 1.f);
-				new_rot.mQ[VS] = U16_to_F32(val[VS], -1.f, 1.f);
-				dp->unpackU16(val[VX], "AccX");
-				dp->unpackU16(val[VY], "AccY");
-				dp->unpackU16(val[VZ], "AccZ");
-				new_angv.set(U16_to_F32(val[VX], -64.f, 64.f),
-									U16_to_F32(val[VY], -64.f, 64.f),
-									U16_to_F32(val[VZ], -64.f, 64.f));
-				setAngularVelocity(new_angv);
-			}
-			break;
-			case OUT_FULL_COMPRESSED:
-			case OUT_FULL_CACHED:
-			{
+                U8      value;
+                dp->unpackU8(value, "agent");
+                if (value)
+                {
+                    LLVector4 collision_plane;
+                    dp->unpackVector4(collision_plane, "Plane");
+                    ((LLVOAvatar*)this)->setFootPlane(collision_plane);
+                }
+                test_pos_parent = getPosition();
+                dp->unpackVector3(new_pos_parent, "Pos");
+                dp->unpackU16(val[VX], "VelX");
+                dp->unpackU16(val[VY], "VelY");
+                dp->unpackU16(val[VZ], "VelZ");
+                setVelocity(U16_to_F32(val[VX], -128.f, 128.f),
+                            U16_to_F32(val[VY], -128.f, 128.f),
+                            U16_to_F32(val[VZ], -128.f, 128.f));
+                dp->unpackU16(val[VX], "AccX");
+                dp->unpackU16(val[VY], "AccY");
+                dp->unpackU16(val[VZ], "AccZ");
+                setAcceleration(U16_to_F32(val[VX], -64.f, 64.f),
+                                U16_to_F32(val[VY], -64.f, 64.f),
+                                U16_to_F32(val[VZ], -64.f, 64.f));
+
+                dp->unpackU16(val[VX], "ThetaX");
+                dp->unpackU16(val[VY], "ThetaY");
+                dp->unpackU16(val[VZ], "ThetaZ");
+                dp->unpackU16(val[VS], "ThetaS");
+                new_rot.mQ[VX] = U16_to_F32(val[VX], -1.f, 1.f);
+                new_rot.mQ[VY] = U16_to_F32(val[VY], -1.f, 1.f);
+                new_rot.mQ[VZ] = U16_to_F32(val[VZ], -1.f, 1.f);
+                new_rot.mQ[VS] = U16_to_F32(val[VS], -1.f, 1.f);
+                dp->unpackU16(val[VX], "AccX");
+                dp->unpackU16(val[VY], "AccY");
+                dp->unpackU16(val[VZ], "AccZ");
+                new_angv.set(U16_to_F32(val[VX], -64.f, 64.f),
+                                    U16_to_F32(val[VY], -64.f, 64.f),
+                                    U16_to_F32(val[VZ], -64.f, 64.f));
+                setAngularVelocity(new_angv);
+            }
+            break;
+            case OUT_FULL_COMPRESSED:
+            case OUT_FULL_CACHED:
+            {
 #ifdef DEBUG_UPDATE_TYPE
-				LL_INFOS() << "CompFull:" << getID() << LL_ENDL;
+                LL_INFOS() << "CompFull:" << getID() << LL_ENDL;
 #endif
-				setObjectCostStale();
-
-				if (isSelected())
-				{
-					gFloaterTools->dirty();
-				}
-	
-				dp->unpackU32(crc, "CRC");
-				mTotalCRC = crc;
-				dp->unpackU8(material, "Material");
-				U8 old_material = getMaterial();
-				if (old_material != material)
-				{
-					setMaterial(material);
-					if (mDrawable.notNull())
-					{
-						gPipeline.markMoved(mDrawable, FALSE); // undamped
-					}
-				}
-				dp->unpackU8(click_action, "ClickAction");
-				setClickAction(click_action);
-				dp->unpackVector3(new_scale, "Scale");
-				dp->unpackVector3(new_pos_parent, "Pos");
-				LLVector3 vec;
-				dp->unpackVector3(vec, "Rot");
-				new_rot.unpackFromVector3(vec);
-				setAcceleration(LLVector3::zero);
-
-				U32 value;
-				dp->unpackU32(value, "SpecialCode");
-				dp->setPassFlags(value);
-				dp->unpackUUID(owner_id, "Owner");
-
-				mOwnerID = owner_id;
-
-				if (value & 0x80)
-				{
-					dp->unpackVector3(new_angv, "Omega");
-					setAngularVelocity(new_angv);
-				}
-
-				if (value & 0x20)
-				{
-					dp->unpackU32(parent_id, "ParentID");
-				}
-				else
-				{
-					parent_id = 0;
-				}
-
-				S32 sp_size;
-				U32 size;
-				if (value & 0x2)
-				{
-					sp_size = 1;
-					delete [] mData;
-					mData = new U8[1];
-					dp->unpackU8(((U8*)mData)[0], "TreeData");
-				}
-				else if (value & 0x1)
-				{
-					dp->unpackU32(size, "ScratchPadSize");
-					delete [] mData;
-					mData = new U8[size];
-					dp->unpackBinaryData((U8 *)mData, sp_size, "PartData");
-				}
-				else
-				{
-					mData = NULL;
-				}
-
-				// Setup object text
-				if (!mText && (value & 0x4))
-				{
-				    initHudText();
-				}
-
-				if (value & 0x4)
-				{
-					std::string temp_string;
-					dp->unpackString(temp_string, "Text");
-					LLColor4U coloru;
-					dp->unpackBinaryDataFixed(coloru.mV, 4, "Color");
-					coloru.mV[3] = 255 - coloru.mV[3];
-					mText->setColor(LLColor4(coloru));
-					mText->setString(temp_string);
+                setObjectCostStale();
+
+                if (isSelected())
+                {
+                    gFloaterTools->dirty();
+                }
+
+                dp->unpackU32(crc, "CRC");
+                mTotalCRC = crc;
+                dp->unpackU8(material, "Material");
+                U8 old_material = getMaterial();
+                if (old_material != material)
+                {
+                    setMaterial(material);
+                    if (mDrawable.notNull())
+                    {
+                        gPipeline.markMoved(mDrawable, FALSE); // undamped
+                    }
+                }
+                dp->unpackU8(click_action, "ClickAction");
+                setClickAction(click_action);
+                dp->unpackVector3(new_scale, "Scale");
+                dp->unpackVector3(new_pos_parent, "Pos");
+                LLVector3 vec;
+                dp->unpackVector3(vec, "Rot");
+                new_rot.unpackFromVector3(vec);
+                setAcceleration(LLVector3::zero);
+
+                U32 value;
+                dp->unpackU32(value, "SpecialCode");
+                dp->setPassFlags(value);
+                dp->unpackUUID(owner_id, "Owner");
+
+                mOwnerID = owner_id;
+
+                if (value & 0x80)
+                {
+                    dp->unpackVector3(new_angv, "Omega");
+                    setAngularVelocity(new_angv);
+                }
+
+                if (value & 0x20)
+                {
+                    dp->unpackU32(parent_id, "ParentID");
+                }
+                else
+                {
+                    parent_id = 0;
+                }
+
+                S32 sp_size;
+                U32 size;
+                if (value & 0x2)
+                {
+                    sp_size = 1;
+                    delete [] mData;
+                    mData = new U8[1];
+                    dp->unpackU8(((U8*)mData)[0], "TreeData");
+                }
+                else if (value & 0x1)
+                {
+                    dp->unpackU32(size, "ScratchPadSize");
+                    delete [] mData;
+                    mData = new U8[size];
+                    dp->unpackBinaryData((U8 *)mData, sp_size, "PartData");
+                }
+                else
+                {
+                    mData = NULL;
+                }
+
+                // Setup object text
+                if (!mText && (value & 0x4))
+                {
+                    initHudText();
+                }
+
+                if (value & 0x4)
+                {
+                    std::string temp_string;
+                    dp->unpackString(temp_string, "Text");
+                    LLColor4U coloru;
+                    dp->unpackBinaryDataFixed(coloru.mV, 4, "Color");
+                    coloru.mV[3] = 255 - coloru.mV[3];
+                    mText->setColor(LLColor4(coloru));
+                    mText->setString(temp_string);
 
                     mHudText = temp_string;
                     mHudTextColor = LLColor4(coloru);
 
-					setChanged(TEXTURE);
-				}
-				else
-				{
-					if (mText.notNull())
-					{
-						mText->markDead();
-						mText = NULL;
-					}
-					mHudText.clear();
-				}
+                    setChanged(TEXTURE);
+                }
+                else
+                {
+                    if (mText.notNull())
+                    {
+                        mText->markDead();
+                        mText = NULL;
+                    }
+                    mHudText.clear();
+                }
 
                 std::string media_url;
-				if (value & 0x200)
-				{
-					dp->unpackString(media_url, "MediaURL");
-				}
+                if (value & 0x200)
+                {
+                    dp->unpackString(media_url, "MediaURL");
+                }
                 retval |= checkMediaURL(media_url);
 
-				//
-				// Unpack particle system data (legacy)
-				//
-				if (value & 0x8)
-				{
-					unpackParticleSource(*dp, owner_id, true);
-				}
-				else if (!(value & 0x400))
-				{
-					deleteParticleSource();
-				}
-				
-				// Mark all extra parameters not used
-				std::unordered_map<U16, ExtraParameter*>::iterator iter;
-				for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
-				{
-					iter->second->in_use = FALSE;
-				}
-
-				// Unpack extra params
-				U8 num_parameters;
-				dp->unpackU8(num_parameters, "num_params");
-				U8 param_block[MAX_OBJECT_PARAMS_SIZE];
-				for (U8 param=0; param<num_parameters; ++param)
-				{
-					U16 param_type;
-					S32 param_size;
-					dp->unpackU16(param_type, "param_type");
-					dp->unpackBinaryData(param_block, param_size, "param_data");
-					//LL_INFOS() << "Param type: " << param_type << ", Size: " << param_size << LL_ENDL;
-					LLDataPackerBinaryBuffer dp2(param_block, param_size);
-					unpackParameterEntry(param_type, &dp2);
-				}
-
-				for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
-				{
-					if (!iter->second->in_use)
-					{
-						// Send an update message in case it was formerly in use
-						parameterChanged(iter->first, iter->second->data, FALSE, false);
-					}
-				}
-
-				if (value & 0x10)
-				{
-					dp->unpackUUID(sound_uuid, "SoundUUID");
-					dp->unpackF32(gain, "SoundGain");
-					dp->unpackU8(sound_flags, "SoundFlags");
-					dp->unpackF32(cutoff, "SoundRadius");
-				}
-
-				if (value & 0x100)
-				{
-					std::string name_value_list;
-					dp->unpackString(name_value_list, "NV");
-
-					setNameValueList(name_value_list);
-				}
-
-				mTotalCRC = crc;
-				mSoundCutOffRadius = cutoff;
-
-				setAttachedSound(sound_uuid, owner_id, gain, sound_flags);
-
-				// only get these flags on updates from sim, not cached ones
-				// Preload these five flags for every object.
-				// Finer shades require the object to be selected, and the selection manager
-				// stores the extended permission info.
-				if(mesgsys != NULL)
-				{
-				U32 flags;
-				mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, block_num);
-				loadFlags(flags);					
-				}
-			}
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	//
-	// Fix object parenting.
-	//
-	BOOL b_changed_status = FALSE;
-
-	if (OUT_TERSE_IMPROVED != update_type)
-	{
-		// We only need to update parenting on full updates, terse updates
-		// don't send parenting information.
-		if (!cur_parentp)
-		{
-			if (parent_id == 0)
-			{
-				// No parent now, no parent in message -> do nothing
-			}
-			else
-			{
-				// No parent now, new parent in message -> attach to that parent if possible
-				LLUUID parent_uuid;
-
-				if(mesgsys != NULL)
-				{
-				LLViewerObjectList::getUUIDFromLocal(parent_uuid,
-														parent_id,
-														mesgsys->getSenderIP(),
-														mesgsys->getSenderPort());
-				}
-				else
-				{
-					LLViewerObjectList::getUUIDFromLocal(parent_uuid,
-														parent_id,
-														mRegionp->getHost().getAddress(),
-														mRegionp->getHost().getPort());
-				}
-
-				LLViewerObject *sent_parentp = gObjectList.findObject(parent_uuid);
-
-				//
-				// Check to see if we have the corresponding viewer object for the parent.
-				//
-				if (sent_parentp && sent_parentp->getParent() == this)
-				{
-					// Try to recover if we attempt to attach a parent to its child
-					LL_WARNS() << "Attempt to attach a parent to it's child: " << this->getID() << " to " << sent_parentp->getID() << LL_ENDL;
-					this->removeChild(sent_parentp);
-					sent_parentp->setDrawableParent(NULL);
-				}
-				
-				if (sent_parentp && (sent_parentp != this) && !sent_parentp->isDead())
-				{
+                //
+                // Unpack particle system data (legacy)
+                //
+                if (value & 0x8)
+                {
+                    unpackParticleSource(*dp, owner_id, true);
+                }
+                else if (!(value & 0x400))
+                {
+                    deleteParticleSource();
+                }
+
+                // Mark all extra parameters not used
+                std::unordered_map<U16, ExtraParameter*>::iterator iter;
+                for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
+                {
+                    iter->second->in_use = FALSE;
+                }
+
+                // Unpack extra params
+                U8 num_parameters;
+                dp->unpackU8(num_parameters, "num_params");
+                U8 param_block[MAX_OBJECT_PARAMS_SIZE];
+                for (U8 param=0; param<num_parameters; ++param)
+                {
+                    U16 param_type;
+                    S32 param_size;
+                    dp->unpackU16(param_type, "param_type");
+                    dp->unpackBinaryData(param_block, param_size, "param_data");
+                    //LL_INFOS() << "Param type: " << param_type << ", Size: " << param_size << LL_ENDL;
+                    LLDataPackerBinaryBuffer dp2(param_block, param_size);
+                    unpackParameterEntry(param_type, &dp2);
+                }
+
+                for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter)
+                {
+                    if (!iter->second->in_use)
+                    {
+                        // Send an update message in case it was formerly in use
+                        parameterChanged(iter->first, iter->second->data, FALSE, false);
+                    }
+                }
+
+                if (value & 0x10)
+                {
+                    dp->unpackUUID(sound_uuid, "SoundUUID");
+                    dp->unpackF32(gain, "SoundGain");
+                    dp->unpackU8(sound_flags, "SoundFlags");
+                    dp->unpackF32(cutoff, "SoundRadius");
+                }
+
+                if (value & 0x100)
+                {
+                    std::string name_value_list;
+                    dp->unpackString(name_value_list, "NV");
+
+                    setNameValueList(name_value_list);
+                }
+
+                mTotalCRC = crc;
+                mSoundCutOffRadius = cutoff;
+
+                setAttachedSound(sound_uuid, owner_id, gain, sound_flags);
+
+                // only get these flags on updates from sim, not cached ones
+                // Preload these five flags for every object.
+                // Finer shades require the object to be selected, and the selection manager
+                // stores the extended permission info.
+                if(mesgsys != NULL)
+                {
+                U32 flags;
+                mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, block_num);
+                loadFlags(flags);
+                }
+            }
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    //
+    // Fix object parenting.
+    //
+    BOOL b_changed_status = FALSE;
+
+    if (OUT_TERSE_IMPROVED != update_type)
+    {
+        // We only need to update parenting on full updates, terse updates
+        // don't send parenting information.
+        if (!cur_parentp)
+        {
+            if (parent_id == 0)
+            {
+                // No parent now, no parent in message -> do nothing
+            }
+            else
+            {
+                // No parent now, new parent in message -> attach to that parent if possible
+                LLUUID parent_uuid;
+
+                if(mesgsys != NULL)
+                {
+                LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                                                        parent_id,
+                                                        mesgsys->getSenderIP(),
+                                                        mesgsys->getSenderPort());
+                }
+                else
+                {
+                    LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                                                        parent_id,
+                                                        mRegionp->getHost().getAddress(),
+                                                        mRegionp->getHost().getPort());
+                }
+
+                LLViewerObject *sent_parentp = gObjectList.findObject(parent_uuid);
+
+                //
+                // Check to see if we have the corresponding viewer object for the parent.
+                //
+                if (sent_parentp && sent_parentp->getParent() == this)
+                {
+                    // Try to recover if we attempt to attach a parent to its child
+                    LL_WARNS() << "Attempt to attach a parent to it's child: " << this->getID() << " to " << sent_parentp->getID() << LL_ENDL;
+                    this->removeChild(sent_parentp);
+                    sent_parentp->setDrawableParent(NULL);
+                }
+
+                if (sent_parentp && (sent_parentp != this) && !sent_parentp->isDead())
+                {
                     if (((LLViewerObject*)sent_parentp)->isAvatar())
                     {
-                        //LL_DEBUGS("Avatar") << "ATT got object update for attachment " << LL_ENDL; 
+                        //LL_DEBUGS("Avatar") << "ATT got object update for attachment " << LL_ENDL;
+                    }
+
+                    //
+                    // We have a viewer object for the parent, and it's not dead.
+                    // Do the actual reparenting here.
+                    //
+
+                    // new parent is valid
+                    b_changed_status = TRUE;
+                    // ...no current parent, so don't try to remove child
+                    if (mDrawable.notNull())
+                    {
+                        if (mDrawable->isDead() || !mDrawable->getVObj())
+                        {
+                            LL_WARNS() << "Drawable is dead or no VObj!" << LL_ENDL;
+                            sent_parentp->addChild(this);
+                        }
+                        else
+                        {
+                            if (!setDrawableParent(sent_parentp->mDrawable)) // LLViewerObject::processUpdateMessage 1
+                            {
+                                // Bad, we got a cycle somehow.
+                                // Kill both the parent and the child, and
+                                // set cache misses for both of them.
+                                LL_WARNS() << "Attempting to recover from parenting cycle!" << LL_ENDL;
+                                LL_WARNS() << "Killing " << sent_parentp->getID() << " and " << getID() << LL_ENDL;
+                                LL_WARNS() << "Adding to cache miss list" << LL_ENDL;
+                                setParent(NULL);
+                                sent_parentp->setParent(NULL);
+                                getRegion()->addCacheMissFull(getLocalID());
+                                getRegion()->addCacheMissFull(sent_parentp->getLocalID());
+                                gObjectList.killObject(sent_parentp);
+                                gObjectList.killObject(this);
+                                return retval;
+                            }
+                            sent_parentp->addChild(this);
+                            // make sure this object gets a non-damped update
+                            if (sent_parentp->mDrawable.notNull())
+                            {
+                                gPipeline.markMoved(sent_parentp->mDrawable, FALSE); // undamped
+                            }
+                        }
+                    }
+                    else
+                    {
+                        sent_parentp->addChild(this);
                     }
-                    
-					//
-					// We have a viewer object for the parent, and it's not dead.
-					// Do the actual reparenting here.
-					//
-
-					// new parent is valid
-					b_changed_status = TRUE;
-					// ...no current parent, so don't try to remove child
-					if (mDrawable.notNull())
-					{
-						if (mDrawable->isDead() || !mDrawable->getVObj())
-						{
-							LL_WARNS() << "Drawable is dead or no VObj!" << LL_ENDL;
-							sent_parentp->addChild(this);
-						}
-						else
-						{
-							if (!setDrawableParent(sent_parentp->mDrawable)) // LLViewerObject::processUpdateMessage 1
-							{
-								// Bad, we got a cycle somehow.
-								// Kill both the parent and the child, and
-								// set cache misses for both of them.
-								LL_WARNS() << "Attempting to recover from parenting cycle!" << LL_ENDL;
-								LL_WARNS() << "Killing " << sent_parentp->getID() << " and " << getID() << LL_ENDL;
-								LL_WARNS() << "Adding to cache miss list" << LL_ENDL;
-								setParent(NULL);
-								sent_parentp->setParent(NULL);
-								getRegion()->addCacheMissFull(getLocalID());
-								getRegion()->addCacheMissFull(sent_parentp->getLocalID());
-								gObjectList.killObject(sent_parentp);
-								gObjectList.killObject(this);
-								return retval;
-							}
-							sent_parentp->addChild(this);
-							// make sure this object gets a non-damped update
-							if (sent_parentp->mDrawable.notNull())
-							{
-								gPipeline.markMoved(sent_parentp->mDrawable, FALSE); // undamped
-							}
-						}
-					}
-					else
-					{
-						sent_parentp->addChild(this);
-					}
-					
-					// Show particles, icon and HUD
-					hideExtraDisplayItems( FALSE );
-
-					setChanged(MOVED | SILHOUETTE);
-				}
-				else
-				{
-					//
-					// No corresponding viewer object for the parent, put the various
-					// pieces on the orphan list.
-					//
-					
-					//parent_id
-					U32 ip, port; 
-					
-					if(mesgsys != NULL)
-					{
-						ip = mesgsys->getSenderIP();
-						port = mesgsys->getSenderPort();
-					}
-					else
-					{
-						ip = mRegionp->getHost().getAddress();
-						port = mRegionp->getHost().getPort();
-					}
-					gObjectList.orphanize(this, parent_id, ip, port);
-
-					// Hide particles, icon and HUD
-					hideExtraDisplayItems( TRUE );
-				}
-			}
-		}
-		else
-		{
-			// BUG: this is a bad assumption once border crossing is alowed
-			if (  (parent_id == cur_parentp->mLocalID)
-				&&(update_type == OUT_TERSE_IMPROVED))
-			{
-				// Parent now, same parent in message -> do nothing
-
-				// Debugging for suspected problems with local ids.
-				//LLUUID parent_uuid;
-				//LLViewerObjectList::getUUIDFromLocal(parent_uuid, parent_id, mesgsys->getSenderIP(), mesgsys->getSenderPort() );
-				//if (parent_uuid != cur_parentp->getID() )
-				//{
-				//	LL_ERRS() << "Local ID match but UUID mismatch of viewer object" << LL_ENDL;
-				//}
-			}
-			else
-			{
-				// Parented now, different parent in message
-				LLViewerObject *sent_parentp;
-				if (parent_id == 0)
-				{
-					//
-					// This object is no longer parented, we sent in a zero parent ID.
-					//
-					sent_parentp = NULL;
-				}
-				else
-				{
-					LLUUID parent_uuid;
-
-					if(mesgsys != NULL)
-					{
-					LLViewerObjectList::getUUIDFromLocal(parent_uuid,
-														parent_id,
-														gMessageSystem->getSenderIP(),
-														gMessageSystem->getSenderPort());
-					}
-					else
-					{
-						LLViewerObjectList::getUUIDFromLocal(parent_uuid,
-														parent_id,
-														mRegionp->getHost().getAddress(),
-														mRegionp->getHost().getPort());
-					}
-					sent_parentp = gObjectList.findObject(parent_uuid);
-					
-					if (isAvatar())
-					{
-						// This logic is meant to handle the case where a sitting avatar has reached a new sim
-						// ahead of the object she was sitting on (which is common as objects are transfered through
-						// a slower route than agents)...
-						// In this case, the local id for the object will not be valid, since the viewer has not received
-						// a full update for the object from that sim yet, so we assume that the agent is still sitting
-						// where she was originally. --RN
-						if (!sent_parentp)
-						{
-							sent_parentp = cur_parentp;
-						}
-					}
-					else if (!sent_parentp)
-					{
-						//
-						// Switching parents, but we don't know the new parent.
-						//
-						U32 ip, port; 
-					
-						if(mesgsys != NULL)
-						{
-							ip = mesgsys->getSenderIP();
-							port = mesgsys->getSenderPort();
-						}
-						else
-						{
-							ip = mRegionp->getHost().getAddress();
-							port = mRegionp->getHost().getPort();
-						}
-
-						// We're an orphan, flag things appropriately.
-						gObjectList.orphanize(this, parent_id, ip, port);
-					}
-				}
-
-				// Reattach if possible.
-				if (sent_parentp && sent_parentp != cur_parentp && sent_parentp != this)
-				{
-					// New parent is valid, detach and reattach
-					b_changed_status = TRUE;
-					if (mDrawable.notNull())
-					{
-						if (!setDrawableParent(sent_parentp->mDrawable)) // LLViewerObject::processUpdateMessage 2
-						{
-							// Bad, we got a cycle somehow.
-							// Kill both the parent and the child, and
-							// set cache misses for both of them.
-							LL_WARNS() << "Attempting to recover from parenting cycle!" << LL_ENDL;
-							LL_WARNS() << "Killing " << sent_parentp->getID() << " and " << getID() << LL_ENDL;
-							LL_WARNS() << "Adding to cache miss list" << LL_ENDL;
-							setParent(NULL);
-							sent_parentp->setParent(NULL);
-							getRegion()->addCacheMissFull(getLocalID());
-							getRegion()->addCacheMissFull(sent_parentp->getLocalID());
-							gObjectList.killObject(sent_parentp);
-							gObjectList.killObject(this);
-							return retval;
-						}
-						// make sure this object gets a non-damped update
-					}
-					cur_parentp->removeChild(this);
-					sent_parentp->addChild(this);
-					setChanged(MOVED | SILHOUETTE);
-					sent_parentp->setChanged(MOVED | SILHOUETTE);
-					if (sent_parentp->mDrawable.notNull())
-					{
-						gPipeline.markMoved(sent_parentp->mDrawable, FALSE); // undamped
-					}
-				}
-				else if (!sent_parentp)
-				{
-					bool remove_parent = true;
-					// No new parent, or the parent that we sent doesn't exist on the viewer.
-					LLViewerObject *parentp = (LLViewerObject *)getParent();
-					if (parentp)
-					{
-						if (parentp->getRegion() != getRegion())
-						{
-							// This is probably an object flying across a region boundary, the
-							// object probably ISN'T being reparented, but just got an object
-							// update out of order (child update before parent).
-							//LL_INFOS() << "Don't reparent object handoffs!" << LL_ENDL;
-							remove_parent = false;
-						}
-					}
-
-					if (remove_parent)
-					{
-						b_changed_status = TRUE;
-						if (mDrawable.notNull())
-						{
-							// clear parent to removeChild can put the drawable on the damped list
-							setDrawableParent(NULL); // LLViewerObject::processUpdateMessage 3
-						}
-
-						cur_parentp->removeChild(this);
-
-						setChanged(MOVED | SILHOUETTE);
-
-						if (mDrawable.notNull())
-						{
-							// make sure this object gets a non-damped update
-							gPipeline.markMoved(mDrawable, FALSE); // undamped
-						}
-					}
-				}
-			}
-		}
-	}
-
-	new_rot.normQuat();
-
-	if (sPingInterpolate && mesgsys != NULL)
-	{ 
-		LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mesgsys->getSender());
-		if (cdp)
-		{
-			// Note: delay is U32 and usually less then second,
-			// converting it into seconds with valueInUnits will result in 0
-			F32 ping_delay = 0.5f * time_dilation * ( ((F32)cdp->getPingDelay().value()) * 0.001f + gFrameDTClamped);
-			LLVector3 diff = getVelocity() * ping_delay; 
-			new_pos_parent += diff;
-		}
-		else
-		{
-			LL_WARNS() << "findCircuit() returned NULL; skipping interpolation" << LL_ENDL;
-		}
-	}
-
-	//////////////////////////
-	//
-	// Set the generic change flags...
-	//
-	//
-
-	// If we're going to skip this message, why are we 
-	// doing all the parenting, etc above?
-	if(mesgsys != NULL)
-	{
-	U32 packet_id = mesgsys->getCurrentRecvPacketID(); 
-	if (packet_id < mLatestRecvPacketID && 
-		mLatestRecvPacketID - packet_id < 65536)
-	{
-		//skip application of this message, it's old
-		return retval;
-	}
-	mLatestRecvPacketID = packet_id;
-	}
-
-	// Set the change flags for scale
-	if (new_scale != getScale())
-	{
-		setChanged(SCALED | SILHOUETTE);
-		setScale(new_scale);  // Must follow setting permYouOwner()
-	}
-
-	// first, let's see if the new position is actually a change
-
-	//static S32 counter = 0;
-
-	F32 vel_mag_sq = getVelocity().magVecSquared();
-	F32 accel_mag_sq = getAcceleration().magVecSquared();
-
-	if (  ((b_changed_status)||(test_pos_parent != new_pos_parent))
-		||(  (!isSelected())
-		   &&(  (vel_mag_sq != 0.f)
-			  ||(accel_mag_sq != 0.f)
-			  ||(this_update_precision > mBestUpdatePrecision))))
-	{
-		mBestUpdatePrecision = this_update_precision;
-		
-		LLVector3 diff = new_pos_parent - test_pos_parent ;
-		F32 mag_sqr = diff.magVecSquared() ;
-		if(llfinite(mag_sqr)) 
-		{
-			setPositionParent(new_pos_parent);
-		}
-		else
-		{
-			LL_WARNS() << "Can not move the object/avatar to an infinite location!" << LL_ENDL ;	
-
-			retval |= INVALID_UPDATE ;
-		}
-
-		if (mParent && ((LLViewerObject*)mParent)->isAvatar())
-		{
-			// we have changed the position of an attachment, so we need to clamp it
-			LLVOAvatar *avatar = (LLVOAvatar*)mParent;
-
-			avatar->clampAttachmentPositions();
-		}
-		
-		// If we're snapping the position by more than 0.5m, update LLViewerStats::mAgentPositionSnaps
-		if ( asAvatar() && asAvatar()->isSelf() && (mag_sqr > 0.25f) )
-		{
-			record(LLStatViewer::AGENT_POSITION_SNAP, LLUnit<F64, LLUnits::Meters>(diff.length()));
-		}
-	}
-
-	if ((new_rot.isNotEqualEps(getRotation(), F_ALMOST_ZERO))
-		|| (new_angv != old_angv))
-	{
-		if (new_rot != mPreviousRotation)
-		{
-			resetRot();
-		}
-		else if (new_angv != old_angv)
-		{
-			if (flagUsePhysics())
-			{
-				resetRot();
-			}
-			else
-			{
-				resetRotTime();
-			}
-		}
-
-		// Remember the last rotation value
-		mPreviousRotation = new_rot;
-
-		// Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega)
-		setRotation(new_rot * mAngularVelocityRot);
-		setChanged(ROTATED | SILHOUETTE);
-	}
-
-	if ( gShowObjectUpdates )
-	{
-		LLColor4 color;
-		if (update_type == OUT_TERSE_IMPROVED)
-		{
-			color.setVec(0.f, 0.f, 1.f, 1.f);
-		}
-		else
-		{
-			color.setVec(1.f, 0.f, 0.f, 1.f);
-		}
-		gPipeline.addDebugBlip(getPositionAgent(), color);
-		LL_DEBUGS("MessageBlip") << "Update type " << (S32)update_type << " blip for local " << mLocalID << " at " << getPositionAgent() << LL_ENDL;
-	}
-
-	const F32 MAG_CUTOFF = F_APPROXIMATELY_ZERO;
-
-	llassert(vel_mag_sq >= 0.f);
-	llassert(accel_mag_sq >= 0.f);
-	llassert(getAngularVelocity().magVecSquared() >= 0.f);
-
-	if ((MAG_CUTOFF >= vel_mag_sq) && 
-		(MAG_CUTOFF >= accel_mag_sq) &&
-		(MAG_CUTOFF >= getAngularVelocity().magVecSquared()))
-	{
-		mStatic = TRUE; // This object doesn't move!
-	}
-	else
-	{
-		mStatic = FALSE;
-	}
+
+                    // Show particles, icon and HUD
+                    hideExtraDisplayItems( FALSE );
+
+                    setChanged(MOVED | SILHOUETTE);
+                }
+                else
+                {
+                    //
+                    // No corresponding viewer object for the parent, put the various
+                    // pieces on the orphan list.
+                    //
+
+                    //parent_id
+                    U32 ip, port;
+
+                    if(mesgsys != NULL)
+                    {
+                        ip = mesgsys->getSenderIP();
+                        port = mesgsys->getSenderPort();
+                    }
+                    else
+                    {
+                        ip = mRegionp->getHost().getAddress();
+                        port = mRegionp->getHost().getPort();
+                    }
+                    gObjectList.orphanize(this, parent_id, ip, port);
+
+                    // Hide particles, icon and HUD
+                    hideExtraDisplayItems( TRUE );
+                }
+            }
+        }
+        else
+        {
+            // BUG: this is a bad assumption once border crossing is alowed
+            if (  (parent_id == cur_parentp->mLocalID)
+                &&(update_type == OUT_TERSE_IMPROVED))
+            {
+                // Parent now, same parent in message -> do nothing
+
+                // Debugging for suspected problems with local ids.
+                //LLUUID parent_uuid;
+                //LLViewerObjectList::getUUIDFromLocal(parent_uuid, parent_id, mesgsys->getSenderIP(), mesgsys->getSenderPort() );
+                //if (parent_uuid != cur_parentp->getID() )
+                //{
+                //  LL_ERRS() << "Local ID match but UUID mismatch of viewer object" << LL_ENDL;
+                //}
+            }
+            else
+            {
+                // Parented now, different parent in message
+                LLViewerObject *sent_parentp;
+                if (parent_id == 0)
+                {
+                    //
+                    // This object is no longer parented, we sent in a zero parent ID.
+                    //
+                    sent_parentp = NULL;
+                }
+                else
+                {
+                    LLUUID parent_uuid;
+
+                    if(mesgsys != NULL)
+                    {
+                    LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                                                        parent_id,
+                                                        gMessageSystem->getSenderIP(),
+                                                        gMessageSystem->getSenderPort());
+                    }
+                    else
+                    {
+                        LLViewerObjectList::getUUIDFromLocal(parent_uuid,
+                                                        parent_id,
+                                                        mRegionp->getHost().getAddress(),
+                                                        mRegionp->getHost().getPort());
+                    }
+                    sent_parentp = gObjectList.findObject(parent_uuid);
+
+                    if (isAvatar())
+                    {
+                        // This logic is meant to handle the case where a sitting avatar has reached a new sim
+                        // ahead of the object she was sitting on (which is common as objects are transfered through
+                        // a slower route than agents)...
+                        // In this case, the local id for the object will not be valid, since the viewer has not received
+                        // a full update for the object from that sim yet, so we assume that the agent is still sitting
+                        // where she was originally. --RN
+                        if (!sent_parentp)
+                        {
+                            sent_parentp = cur_parentp;
+                        }
+                    }
+                    else if (!sent_parentp)
+                    {
+                        //
+                        // Switching parents, but we don't know the new parent.
+                        //
+                        U32 ip, port;
+
+                        if(mesgsys != NULL)
+                        {
+                            ip = mesgsys->getSenderIP();
+                            port = mesgsys->getSenderPort();
+                        }
+                        else
+                        {
+                            ip = mRegionp->getHost().getAddress();
+                            port = mRegionp->getHost().getPort();
+                        }
+
+                        // We're an orphan, flag things appropriately.
+                        gObjectList.orphanize(this, parent_id, ip, port);
+                    }
+                }
+
+                // Reattach if possible.
+                if (sent_parentp && sent_parentp != cur_parentp && sent_parentp != this)
+                {
+                    // New parent is valid, detach and reattach
+                    b_changed_status = TRUE;
+                    if (mDrawable.notNull())
+                    {
+                        if (!setDrawableParent(sent_parentp->mDrawable)) // LLViewerObject::processUpdateMessage 2
+                        {
+                            // Bad, we got a cycle somehow.
+                            // Kill both the parent and the child, and
+                            // set cache misses for both of them.
+                            LL_WARNS() << "Attempting to recover from parenting cycle!" << LL_ENDL;
+                            LL_WARNS() << "Killing " << sent_parentp->getID() << " and " << getID() << LL_ENDL;
+                            LL_WARNS() << "Adding to cache miss list" << LL_ENDL;
+                            setParent(NULL);
+                            sent_parentp->setParent(NULL);
+                            getRegion()->addCacheMissFull(getLocalID());
+                            getRegion()->addCacheMissFull(sent_parentp->getLocalID());
+                            gObjectList.killObject(sent_parentp);
+                            gObjectList.killObject(this);
+                            return retval;
+                        }
+                        // make sure this object gets a non-damped update
+                    }
+                    cur_parentp->removeChild(this);
+                    sent_parentp->addChild(this);
+                    setChanged(MOVED | SILHOUETTE);
+                    sent_parentp->setChanged(MOVED | SILHOUETTE);
+                    if (sent_parentp->mDrawable.notNull())
+                    {
+                        gPipeline.markMoved(sent_parentp->mDrawable, FALSE); // undamped
+                    }
+                }
+                else if (!sent_parentp)
+                {
+                    bool remove_parent = true;
+                    // No new parent, or the parent that we sent doesn't exist on the viewer.
+                    LLViewerObject *parentp = (LLViewerObject *)getParent();
+                    if (parentp)
+                    {
+                        if (parentp->getRegion() != getRegion())
+                        {
+                            // This is probably an object flying across a region boundary, the
+                            // object probably ISN'T being reparented, but just got an object
+                            // update out of order (child update before parent).
+                            //LL_INFOS() << "Don't reparent object handoffs!" << LL_ENDL;
+                            remove_parent = false;
+                        }
+                    }
+
+                    if (remove_parent)
+                    {
+                        b_changed_status = TRUE;
+                        if (mDrawable.notNull())
+                        {
+                            // clear parent to removeChild can put the drawable on the damped list
+                            setDrawableParent(NULL); // LLViewerObject::processUpdateMessage 3
+                        }
+
+                        cur_parentp->removeChild(this);
+
+                        setChanged(MOVED | SILHOUETTE);
+
+                        if (mDrawable.notNull())
+                        {
+                            // make sure this object gets a non-damped update
+                            gPipeline.markMoved(mDrawable, FALSE); // undamped
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    new_rot.normQuat();
+
+    if (sPingInterpolate && mesgsys != NULL)
+    {
+        LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mesgsys->getSender());
+        if (cdp)
+        {
+            // Note: delay is U32 and usually less then second,
+            // converting it into seconds with valueInUnits will result in 0
+            F32 ping_delay = 0.5f * time_dilation * ( ((F32)cdp->getPingDelay().value()) * 0.001f + gFrameDTClamped);
+            LLVector3 diff = getVelocity() * ping_delay;
+            new_pos_parent += diff;
+        }
+        else
+        {
+            LL_WARNS() << "findCircuit() returned NULL; skipping interpolation" << LL_ENDL;
+        }
+    }
+
+    //////////////////////////
+    //
+    // Set the generic change flags...
+    //
+    //
+
+    // If we're going to skip this message, why are we
+    // doing all the parenting, etc above?
+    if(mesgsys != NULL)
+    {
+    U32 packet_id = mesgsys->getCurrentRecvPacketID();
+    if (packet_id < mLatestRecvPacketID &&
+        mLatestRecvPacketID - packet_id < 65536)
+    {
+        //skip application of this message, it's old
+        return retval;
+    }
+    mLatestRecvPacketID = packet_id;
+    }
+
+    // Set the change flags for scale
+    if (new_scale != getScale())
+    {
+        setChanged(SCALED | SILHOUETTE);
+        setScale(new_scale);  // Must follow setting permYouOwner()
+    }
+
+    // first, let's see if the new position is actually a change
+
+    //static S32 counter = 0;
+
+    F32 vel_mag_sq = getVelocity().magVecSquared();
+    F32 accel_mag_sq = getAcceleration().magVecSquared();
+
+    if (  ((b_changed_status)||(test_pos_parent != new_pos_parent))
+        ||(  (!isSelected())
+           &&(  (vel_mag_sq != 0.f)
+              ||(accel_mag_sq != 0.f)
+              ||(this_update_precision > mBestUpdatePrecision))))
+    {
+        mBestUpdatePrecision = this_update_precision;
+
+        LLVector3 diff = new_pos_parent - test_pos_parent ;
+        F32 mag_sqr = diff.magVecSquared() ;
+        if(llfinite(mag_sqr))
+        {
+            setPositionParent(new_pos_parent);
+        }
+        else
+        {
+            LL_WARNS() << "Can not move the object/avatar to an infinite location!" << LL_ENDL ;
+
+            retval |= INVALID_UPDATE ;
+        }
+
+        if (mParent && ((LLViewerObject*)mParent)->isAvatar())
+        {
+            // we have changed the position of an attachment, so we need to clamp it
+            LLVOAvatar *avatar = (LLVOAvatar*)mParent;
+
+            avatar->clampAttachmentPositions();
+        }
+
+        // If we're snapping the position by more than 0.5m, update LLViewerStats::mAgentPositionSnaps
+        if ( asAvatar() && asAvatar()->isSelf() && (mag_sqr > 0.25f) )
+        {
+            record(LLStatViewer::AGENT_POSITION_SNAP, LLUnit<F64, LLUnits::Meters>(diff.length()));
+        }
+    }
+
+    if ((new_rot.isNotEqualEps(getRotation(), F_ALMOST_ZERO))
+        || (new_angv != old_angv))
+    {
+        if (new_rot != mPreviousRotation)
+        {
+            resetRot();
+        }
+        else if (new_angv != old_angv)
+        {
+            if (flagUsePhysics())
+            {
+                resetRot();
+            }
+            else
+            {
+                resetRotTime();
+            }
+        }
+
+        // Remember the last rotation value
+        mPreviousRotation = new_rot;
+
+        // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega)
+        setRotation(new_rot * mAngularVelocityRot);
+        setChanged(ROTATED | SILHOUETTE);
+    }
+
+    if ( gShowObjectUpdates )
+    {
+        LLColor4 color;
+        if (update_type == OUT_TERSE_IMPROVED)
+        {
+            color.setVec(0.f, 0.f, 1.f, 1.f);
+        }
+        else
+        {
+            color.setVec(1.f, 0.f, 0.f, 1.f);
+        }
+        gPipeline.addDebugBlip(getPositionAgent(), color);
+        LL_DEBUGS("MessageBlip") << "Update type " << (S32)update_type << " blip for local " << mLocalID << " at " << getPositionAgent() << LL_ENDL;
+    }
+
+    const F32 MAG_CUTOFF = F_APPROXIMATELY_ZERO;
+
+    llassert(vel_mag_sq >= 0.f);
+    llassert(accel_mag_sq >= 0.f);
+    llassert(getAngularVelocity().magVecSquared() >= 0.f);
+
+    if ((MAG_CUTOFF >= vel_mag_sq) &&
+        (MAG_CUTOFF >= accel_mag_sq) &&
+        (MAG_CUTOFF >= getAngularVelocity().magVecSquared()))
+    {
+        mStatic = TRUE; // This object doesn't move!
+    }
+    else
+    {
+        mStatic = FALSE;
+    }
 
 // BUG: This code leads to problems during group rotate and any scale operation.
-// Small discepencies between the simulator and viewer representations cause the 
+// Small discepencies between the simulator and viewer representations cause the
 // selection center to creep, leading to objects moving around the wrong center.
-// 
+//
 // Removing this, however, means that if someone else drags an object you have
 // selected, your selection center and dialog boxes will be wrong.  It also means
 // that higher precision information on selected objects will be ignored.
 //
 // I believe the group rotation problem is fixed.  JNC 1.21.2002
 //
-	// Additionally, if any child is selected, need to update the dialogs and selection
-	// center.
-	BOOL needs_refresh = mUserSelected;
-	for (child_list_t::iterator iter = mChildList.begin();
-		 iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* child = *iter;
-		needs_refresh = needs_refresh || child->mUserSelected;
-	}
+    // Additionally, if any child is selected, need to update the dialogs and selection
+    // center.
+    BOOL needs_refresh = mUserSelected;
+    for (child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        needs_refresh = needs_refresh || child->mUserSelected;
+    }
 
     static LLCachedControl<bool> allow_select_avatar(gSavedSettings, "AllowSelectAvatar", FALSE);
-	if (needs_refresh)
-	{
-		LLSelectMgr::getInstance()->updateSelectionCenter();
-		dialog_refresh_all();
-	}
+    if (needs_refresh)
+    {
+        LLSelectMgr::getInstance()->updateSelectionCenter();
+        dialog_refresh_all();
+    }
     else if (allow_select_avatar && asAvatar())
     {
         // Override any avatar position updates received
@@ -2498,280 +2498,280 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
     }
 
 
-	// Mark update time as approx. now, with the ping delay.
-	// Ping delay is off because it's not set for velocity interpolation, causing
-	// much jumping and hopping around...
+    // Mark update time as approx. now, with the ping delay.
+    // Ping delay is off because it's not set for velocity interpolation, causing
+    // much jumping and hopping around...
 
-//	U32 ping_delay = mesgsys->mCircuitInfo.getPingDelay();
-	mLastInterpUpdateSecs = LLFrameTimer::getElapsedSeconds();
-	mLastMessageUpdateSecs = mLastInterpUpdateSecs;
-	if (mDrawable.notNull())
-	{
-		// Don't clear invisibility flag on update if still orphaned!
-		if (mDrawable->isState(LLDrawable::FORCE_INVISIBLE) && !mOrphaned)
-		{
-// 			LL_DEBUGS() << "Clearing force invisible: " << mID << ":" << getPCodeString() << ":" << getPositionAgent() << LL_ENDL;
-			mDrawable->clearState(LLDrawable::FORCE_INVISIBLE);
-			gPipeline.markRebuild( mDrawable, LLDrawable::REBUILD_ALL);
-		}
-	}
+//  U32 ping_delay = mesgsys->mCircuitInfo.getPingDelay();
+    mLastInterpUpdateSecs = LLFrameTimer::getElapsedSeconds();
+    mLastMessageUpdateSecs = mLastInterpUpdateSecs;
+    if (mDrawable.notNull())
+    {
+        // Don't clear invisibility flag on update if still orphaned!
+        if (mDrawable->isState(LLDrawable::FORCE_INVISIBLE) && !mOrphaned)
+        {
+//          LL_DEBUGS() << "Clearing force invisible: " << mID << ":" << getPCodeString() << ":" << getPositionAgent() << LL_ENDL;
+            mDrawable->clearState(LLDrawable::FORCE_INVISIBLE);
+            gPipeline.markRebuild( mDrawable, LLDrawable::REBUILD_ALL);
+        }
+    }
 
-	// Update special hover cursor status
-	bool special_hover_cursor = specialHoverCursor();
-	if (old_special_hover_cursor != special_hover_cursor
-		&& mDrawable.notNull())
-	{
-		mDrawable->updateSpecialHoverCursor(special_hover_cursor);
-	}
+    // Update special hover cursor status
+    bool special_hover_cursor = specialHoverCursor();
+    if (old_special_hover_cursor != special_hover_cursor
+        && mDrawable.notNull())
+    {
+        mDrawable->updateSpecialHoverCursor(special_hover_cursor);
+    }
 
-	return retval;
+    return retval;
 }
 
 BOOL LLViewerObject::isActive() const
 {
-	return TRUE;
+    return TRUE;
 }
 
 //load flags from cache or from message
 void LLViewerObject::loadFlags(U32 flags)
 {
-	if(flags == (U32)(-1))
-	{
-		return; //invalid
-	}
+    if(flags == (U32)(-1))
+    {
+        return; //invalid
+    }
 
-	// keep local flags and overwrite remote-controlled flags
-	mFlags = (mFlags & FLAGS_LOCAL) | flags;
+    // keep local flags and overwrite remote-controlled flags
+    mFlags = (mFlags & FLAGS_LOCAL) | flags;
 
-	// ...new objects that should come in selected need to be added to the selected list
-	mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
-	return;
+    // ...new objects that should come in selected need to be added to the selected list
+    mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
+    return;
 }
 
 void LLViewerObject::idleUpdate(LLAgent &agent, const F64 &frame_time)
 {
-	if (!mDead)
-	{
-		if (!mStatic && sVelocityInterpolate && !isSelected())
-		{
-			// calculate dt from last update
-			F32 time_dilation = mRegionp ? mRegionp->getTimeDilation() : 1.0f;
-			F32 dt_raw = ((F64Seconds)frame_time - mLastInterpUpdateSecs).value();
-			F32 dt = time_dilation * dt_raw;
+    if (!mDead)
+    {
+        if (!mStatic && sVelocityInterpolate && !isSelected())
+        {
+            // calculate dt from last update
+            F32 time_dilation = mRegionp ? mRegionp->getTimeDilation() : 1.0f;
+            F32 dt_raw = ((F64Seconds)frame_time - mLastInterpUpdateSecs).value();
+            F32 dt = time_dilation * dt_raw;
 
-			applyAngularVelocity(dt);
+            applyAngularVelocity(dt);
 
-			if (isAttachment())
-			{
-				mLastInterpUpdateSecs = (F64Seconds)frame_time;
-				return;
-			}
-			else
-			{	// Move object based on it's velocity and rotation
-				interpolateLinearMotion(frame_time, dt);
-			}
-		}
+            if (isAttachment())
+            {
+                mLastInterpUpdateSecs = (F64Seconds)frame_time;
+                return;
+            }
+            else
+            {   // Move object based on it's velocity and rotation
+                interpolateLinearMotion(frame_time, dt);
+            }
+        }
 
-		updateDrawable(FALSE);
-	}
+        updateDrawable(FALSE);
+    }
 }
 
 
 // Move an object due to idle-time viewer side updates by interpolating motion
 void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& frame_time, const F32SecondsImplicit& dt_seconds)
 {
-	// linear motion
-	// PHYSICS_TIMESTEP is used below to correct for the fact that the velocity in object
-	// updates represents the average velocity of the last timestep, rather than the final velocity.
-	// the time dilation above should guarantee that dt is never less than PHYSICS_TIMESTEP, theoretically
-	// 
-	// *TODO: should also wrap linear accel/velocity in check
-	// to see if object is selected, instead of explicitly
-	// zeroing it out	
-
-	F32 dt = dt_seconds;
-	F64Seconds time_since_last_update = frame_time - mLastMessageUpdateSecs;
-	if (time_since_last_update <= (F64Seconds)0.0 || dt <= 0.f)
-	{
-		return;
-	}
-
-	LLVector3 accel = getAcceleration();
-	LLVector3 vel 	= getVelocity();
-	
-	if (sMaxUpdateInterpolationTime <= (F64Seconds)0.0)
-	{	// Old code path ... unbounded, simple interpolation
-		if (!(accel.isExactlyZero() && vel.isExactlyZero()))
-		{
-			LLVector3 pos   = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;  
-		
-			// region local  
-			setPositionRegion(pos + getPositionRegion());
-			setVelocity(vel + accel*dt);	
-			
-			// for objects that are spinning but not translating, make sure to flag them as having moved
-			setChanged(MOVED | SILHOUETTE);
-		}
-	}
-	else if (!accel.isExactlyZero() || !vel.isExactlyZero())		// object is moving
-	{	// Object is moving, and hasn't been too long since we got an update from the server
-		
-		// Calculate predicted position and velocity
-		LLVector3 new_pos = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;	
-		LLVector3 new_v = accel * dt;
-
-		if (time_since_last_update > sPhaseOutUpdateInterpolationTime &&
-			sPhaseOutUpdateInterpolationTime > (F64Seconds)0.0)
-		{	// Haven't seen a viewer update in a while, check to see if the circuit is still active
-			if (mRegionp)
-			{	// The simulator will NOT send updates if the object continues normally on the path
-				// predicted by the velocity and the acceleration (often gravity) sent to the viewer
-				// So check to see if the circuit is blocked, which means the sim is likely in a long lag
-				LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit( mRegionp->getHost() );
-				if (cdp)
-				{
-					// Find out how many seconds since last packet arrived on the circuit
-					F64Seconds time_since_last_packet = LLMessageSystem::getMessageTimeSeconds() - cdp->getLastPacketInTime();
-
-					if (!cdp->isAlive() ||		// Circuit is dead or blocked
-						 cdp->isBlocked() ||	// or doesn't seem to be getting any packets
-						 (time_since_last_packet > sPhaseOutUpdateInterpolationTime))
-					{
-						// Start to reduce motion interpolation since we haven't seen a server update in a while
-						F64Seconds time_since_last_interpolation = frame_time - mLastInterpUpdateSecs;
-						F64 phase_out = 1.0;
-						if (time_since_last_update > sMaxUpdateInterpolationTime)
-						{	// Past the time limit, so stop the object
-							phase_out = 0.0;
-							//LL_INFOS() << "Motion phase out to zero" << LL_ENDL;
-
-							// Kill angular motion as well.  Note - not adding this due to paranoia
-							// about stopping rotation for llTargetOmega objects and not having it restart
-							// setAngularVelocity(LLVector3::zero);
-						}
-						else if (mLastInterpUpdateSecs - mLastMessageUpdateSecs > sPhaseOutUpdateInterpolationTime)
-						{	// Last update was already phased out a bit
-							phase_out = (sMaxUpdateInterpolationTime - time_since_last_update) / 
-										(sMaxUpdateInterpolationTime - time_since_last_interpolation);
-							//LL_INFOS() << "Continuing motion phase out of " << (F32) phase_out << LL_ENDL;
-						}
-						else
-						{	// Phase out from full value
-							phase_out = (sMaxUpdateInterpolationTime - time_since_last_update) / 
-										(sMaxUpdateInterpolationTime - sPhaseOutUpdateInterpolationTime);
-							//LL_INFOS() << "Starting motion phase out of " << (F32) phase_out << LL_ENDL;
-						}
-						phase_out = llclamp(phase_out, 0.0, 1.0);
-
-						new_pos = new_pos * ((F32) phase_out);
-						new_v = new_v * ((F32) phase_out);
-					}
-				}
-			}
-		}
-
-		new_pos = new_pos + getPositionRegion();
-		new_v = new_v + vel;
-
-
-		// Clamp interpolated position to minimum underground and maximum region height
-		LLVector3d new_pos_global = mRegionp->getPosGlobalFromRegion(new_pos);
-		F32 min_height;
-		if (isAvatar())
-		{	// Make a better guess about AVs not going underground
-			min_height = LLWorld::getInstance()->resolveLandHeightGlobal(new_pos_global);
-			min_height += (0.5f * getScale().mV[VZ]);
-		}
-		else
-		{	// This will put the object underground, but we can't tell if it will stop 
-			// at ground level or not
-			min_height = LLWorld::getInstance()->getMinAllowedZ(this, new_pos_global);
-			// Cap maximum height
-			new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]);
-		}
-
-		new_pos.mV[VZ] = llmax(min_height, new_pos.mV[VZ]);
-
-		// Check to see if it's going off the region
-		LLVector3 temp(new_pos.mV[VX], new_pos.mV[VY], 0.f);
-		if (temp.clamp(0.f, mRegionp->getWidth()))
-		{	// Going off this region, so see if we might end up on another region
-			LLVector3d old_pos_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
-			new_pos_global = mRegionp->getPosGlobalFromRegion(new_pos);		// Re-fetch in case it got clipped above
-
-			// Clip the positions to known regions
-			LLVector3d clip_pos_global = LLWorld::getInstance()->clipToVisibleRegions(old_pos_global, new_pos_global);
-			if (clip_pos_global != new_pos_global)
-			{
-				// Was clipped, so this means we hit a edge where there is no region to enter
-				LLVector3 clip_pos = mRegionp->getPosRegionFromGlobal(clip_pos_global);
-				LL_DEBUGS("Interpolate") << "Hit empty region edge, clipped predicted position to "
-										 << clip_pos
-										 << " from " << new_pos << LL_ENDL;
-				new_pos = clip_pos;
-				
-				// Stop motion and get server update for bouncing on the edge
-				new_v.clear();
-				setAcceleration(LLVector3::zero);
-			}
-			else
-			{
-				// Check for how long we are crossing.
-				// Note: theoretically we can find time from velocity, acceleration and
-				// distance from border to new position, but it is not going to work
-				// if 'phase_out' activates
-				if (mRegionCrossExpire == 0)
-				{
-					// Workaround: we can't accurately figure out time when we cross border
-					// so just write down time 'after the fact', it is far from optimal in
-					// case of lags, but for lags sMaxUpdateInterpolationTime will kick in first
-					LL_DEBUGS("Interpolate") << "Predicted region crossing, new position " << new_pos << LL_ENDL;
-					mRegionCrossExpire = frame_time + sMaxRegionCrossingInterpolationTime;
-				}
-				else if (frame_time > mRegionCrossExpire)
-				{
-					// Predicting crossing over 1s, stop motion
-					// Stop motion
-					LL_DEBUGS("Interpolate") << "Predicting region crossing for too long, stopping at " << new_pos << LL_ENDL;
-					new_v.clear();
-					setAcceleration(LLVector3::zero);
-					mRegionCrossExpire = 0;
-				}
-			}
-		}
-		else
-		{
-			mRegionCrossExpire = 0;
-		}
-
-		// Set new position and velocity
-		setPositionRegion(new_pos);
-		setVelocity(new_v);	
-		
-		// for objects that are spinning but not translating, make sure to flag them as having moved
-		setChanged(MOVED | SILHOUETTE);
-	}		
-
-	// Update the last time we did anything
-	mLastInterpUpdateSecs = frame_time;
+    // linear motion
+    // PHYSICS_TIMESTEP is used below to correct for the fact that the velocity in object
+    // updates represents the average velocity of the last timestep, rather than the final velocity.
+    // the time dilation above should guarantee that dt is never less than PHYSICS_TIMESTEP, theoretically
+    //
+    // *TODO: should also wrap linear accel/velocity in check
+    // to see if object is selected, instead of explicitly
+    // zeroing it out
+
+    F32 dt = dt_seconds;
+    F64Seconds time_since_last_update = frame_time - mLastMessageUpdateSecs;
+    if (time_since_last_update <= (F64Seconds)0.0 || dt <= 0.f)
+    {
+        return;
+    }
+
+    LLVector3 accel = getAcceleration();
+    LLVector3 vel   = getVelocity();
+
+    if (sMaxUpdateInterpolationTime <= (F64Seconds)0.0)
+    {   // Old code path ... unbounded, simple interpolation
+        if (!(accel.isExactlyZero() && vel.isExactlyZero()))
+        {
+            LLVector3 pos   = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;
+
+            // region local
+            setPositionRegion(pos + getPositionRegion());
+            setVelocity(vel + accel*dt);
+
+            // for objects that are spinning but not translating, make sure to flag them as having moved
+            setChanged(MOVED | SILHOUETTE);
+        }
+    }
+    else if (!accel.isExactlyZero() || !vel.isExactlyZero())        // object is moving
+    {   // Object is moving, and hasn't been too long since we got an update from the server
+
+        // Calculate predicted position and velocity
+        LLVector3 new_pos = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;
+        LLVector3 new_v = accel * dt;
+
+        if (time_since_last_update > sPhaseOutUpdateInterpolationTime &&
+            sPhaseOutUpdateInterpolationTime > (F64Seconds)0.0)
+        {   // Haven't seen a viewer update in a while, check to see if the circuit is still active
+            if (mRegionp)
+            {   // The simulator will NOT send updates if the object continues normally on the path
+                // predicted by the velocity and the acceleration (often gravity) sent to the viewer
+                // So check to see if the circuit is blocked, which means the sim is likely in a long lag
+                LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit( mRegionp->getHost() );
+                if (cdp)
+                {
+                    // Find out how many seconds since last packet arrived on the circuit
+                    F64Seconds time_since_last_packet = LLMessageSystem::getMessageTimeSeconds() - cdp->getLastPacketInTime();
+
+                    if (!cdp->isAlive() ||      // Circuit is dead or blocked
+                         cdp->isBlocked() ||    // or doesn't seem to be getting any packets
+                         (time_since_last_packet > sPhaseOutUpdateInterpolationTime))
+                    {
+                        // Start to reduce motion interpolation since we haven't seen a server update in a while
+                        F64Seconds time_since_last_interpolation = frame_time - mLastInterpUpdateSecs;
+                        F64 phase_out = 1.0;
+                        if (time_since_last_update > sMaxUpdateInterpolationTime)
+                        {   // Past the time limit, so stop the object
+                            phase_out = 0.0;
+                            //LL_INFOS() << "Motion phase out to zero" << LL_ENDL;
+
+                            // Kill angular motion as well.  Note - not adding this due to paranoia
+                            // about stopping rotation for llTargetOmega objects and not having it restart
+                            // setAngularVelocity(LLVector3::zero);
+                        }
+                        else if (mLastInterpUpdateSecs - mLastMessageUpdateSecs > sPhaseOutUpdateInterpolationTime)
+                        {   // Last update was already phased out a bit
+                            phase_out = (sMaxUpdateInterpolationTime - time_since_last_update) /
+                                        (sMaxUpdateInterpolationTime - time_since_last_interpolation);
+                            //LL_INFOS() << "Continuing motion phase out of " << (F32) phase_out << LL_ENDL;
+                        }
+                        else
+                        {   // Phase out from full value
+                            phase_out = (sMaxUpdateInterpolationTime - time_since_last_update) /
+                                        (sMaxUpdateInterpolationTime - sPhaseOutUpdateInterpolationTime);
+                            //LL_INFOS() << "Starting motion phase out of " << (F32) phase_out << LL_ENDL;
+                        }
+                        phase_out = llclamp(phase_out, 0.0, 1.0);
+
+                        new_pos = new_pos * ((F32) phase_out);
+                        new_v = new_v * ((F32) phase_out);
+                    }
+                }
+            }
+        }
+
+        new_pos = new_pos + getPositionRegion();
+        new_v = new_v + vel;
+
+
+        // Clamp interpolated position to minimum underground and maximum region height
+        LLVector3d new_pos_global = mRegionp->getPosGlobalFromRegion(new_pos);
+        F32 min_height;
+        if (isAvatar())
+        {   // Make a better guess about AVs not going underground
+            min_height = LLWorld::getInstance()->resolveLandHeightGlobal(new_pos_global);
+            min_height += (0.5f * getScale().mV[VZ]);
+        }
+        else
+        {   // This will put the object underground, but we can't tell if it will stop
+            // at ground level or not
+            min_height = LLWorld::getInstance()->getMinAllowedZ(this, new_pos_global);
+            // Cap maximum height
+            new_pos.mV[VZ] = llmin(LLWorld::getInstance()->getRegionMaxHeight(), new_pos.mV[VZ]);
+        }
+
+        new_pos.mV[VZ] = llmax(min_height, new_pos.mV[VZ]);
+
+        // Check to see if it's going off the region
+        LLVector3 temp(new_pos.mV[VX], new_pos.mV[VY], 0.f);
+        if (temp.clamp(0.f, mRegionp->getWidth()))
+        {   // Going off this region, so see if we might end up on another region
+            LLVector3d old_pos_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
+            new_pos_global = mRegionp->getPosGlobalFromRegion(new_pos);     // Re-fetch in case it got clipped above
+
+            // Clip the positions to known regions
+            LLVector3d clip_pos_global = LLWorld::getInstance()->clipToVisibleRegions(old_pos_global, new_pos_global);
+            if (clip_pos_global != new_pos_global)
+            {
+                // Was clipped, so this means we hit a edge where there is no region to enter
+                LLVector3 clip_pos = mRegionp->getPosRegionFromGlobal(clip_pos_global);
+                LL_DEBUGS("Interpolate") << "Hit empty region edge, clipped predicted position to "
+                                         << clip_pos
+                                         << " from " << new_pos << LL_ENDL;
+                new_pos = clip_pos;
+
+                // Stop motion and get server update for bouncing on the edge
+                new_v.clear();
+                setAcceleration(LLVector3::zero);
+            }
+            else
+            {
+                // Check for how long we are crossing.
+                // Note: theoretically we can find time from velocity, acceleration and
+                // distance from border to new position, but it is not going to work
+                // if 'phase_out' activates
+                if (mRegionCrossExpire == 0)
+                {
+                    // Workaround: we can't accurately figure out time when we cross border
+                    // so just write down time 'after the fact', it is far from optimal in
+                    // case of lags, but for lags sMaxUpdateInterpolationTime will kick in first
+                    LL_DEBUGS("Interpolate") << "Predicted region crossing, new position " << new_pos << LL_ENDL;
+                    mRegionCrossExpire = frame_time + sMaxRegionCrossingInterpolationTime;
+                }
+                else if (frame_time > mRegionCrossExpire)
+                {
+                    // Predicting crossing over 1s, stop motion
+                    // Stop motion
+                    LL_DEBUGS("Interpolate") << "Predicting region crossing for too long, stopping at " << new_pos << LL_ENDL;
+                    new_v.clear();
+                    setAcceleration(LLVector3::zero);
+                    mRegionCrossExpire = 0;
+                }
+            }
+        }
+        else
+        {
+            mRegionCrossExpire = 0;
+        }
+
+        // Set new position and velocity
+        setPositionRegion(new_pos);
+        setVelocity(new_v);
+
+        // for objects that are spinning but not translating, make sure to flag them as having moved
+        setChanged(MOVED | SILHOUETTE);
+    }
+
+    // Update the last time we did anything
+    mLastInterpUpdateSecs = frame_time;
 }
 
 
 
 BOOL LLViewerObject::setData(const U8 *datap, const U32 data_size)
 {
-	delete [] mData;
+    delete [] mData;
 
-	if (datap)
-	{
-		mData = new U8[data_size];
-		if (!mData)
-		{
-			return FALSE;
-		}
-		memcpy(mData, datap, data_size);		/* Flawfinder: ignore */
-	}
-	return TRUE;
+    if (datap)
+    {
+        mData = new U8[data_size];
+        if (!mData)
+        {
+            return FALSE;
+        }
+        memcpy(mData, datap, data_size);        /* Flawfinder: ignore */
+    }
+    return TRUE;
 }
 
 // delete an item in the inventory, but don't tell the server. This is
@@ -2779,213 +2779,213 @@ BOOL LLViewerObject::setData(const U8 *datap, const U32 data_size)
 // This will only delete the first item with an item_id in the list
 void LLViewerObject::deleteInventoryItem(const LLUUID& item_id)
 {
-	if(mInventory)
-	{
-		LLInventoryObject::object_list_t::iterator it = mInventory->begin();
-		LLInventoryObject::object_list_t::iterator end = mInventory->end();
-		for( ; it != end; ++it )
-		{
-			if((*it)->getUUID() == item_id)
-			{
-				// This is safe only because we return immediatly.
-				mInventory->erase(it); // will deref and delete it
-				return;
-			}
-		}
-		doInventoryCallback();
-	}
+    if(mInventory)
+    {
+        LLInventoryObject::object_list_t::iterator it = mInventory->begin();
+        LLInventoryObject::object_list_t::iterator end = mInventory->end();
+        for( ; it != end; ++it )
+        {
+            if((*it)->getUUID() == item_id)
+            {
+                // This is safe only because we return immediatly.
+                mInventory->erase(it); // will deref and delete it
+                return;
+            }
+        }
+        doInventoryCallback();
+    }
 }
 
 void LLViewerObject::doUpdateInventory(
-	LLPointer<LLViewerInventoryItem>& item,
-	U8 key,
-	bool is_new)
-{
-	LLViewerInventoryItem* old_item = NULL;
-	if(TASK_INVENTORY_ITEM_KEY == key)
-	{
-		old_item = (LLViewerInventoryItem*)getInventoryObject(item->getUUID());
-	}
-	else if(TASK_INVENTORY_ASSET_KEY == key)
-	{
-		old_item = getInventoryItemByAsset(item->getAssetUUID());
-	}
-	LLUUID item_id;
-	LLUUID new_owner;
-	LLUUID new_group;
-	BOOL group_owned = FALSE;
-	if(old_item)
-	{
-		item_id = old_item->getUUID();
-		new_owner = old_item->getPermissions().getOwner();
-		new_group = old_item->getPermissions().getGroup();
-		group_owned = old_item->getPermissions().isGroupOwned();
-		old_item = NULL;
-	}
-	else
-	{
-		item_id = item->getUUID();
-	}
-	if(!is_new && mInventory)
-	{
-		// Attempt to update the local inventory. If we can get the
-		// object perm, we have perfect visibility, so we want the
-		// serial number to match. Otherwise, take our best guess and
-		// make sure that the serial number does not match.
-		deleteInventoryItem(item_id);
-		LLPermissions perm(item->getPermissions());
-		LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(this);
-		bool is_atomic = ((S32)LLAssetType::AT_OBJECT == item->getType()) ? false : true;
-		if(obj_perm)
-		{
-			perm.setOwnerAndGroup(LLUUID::null, obj_perm->getOwner(), obj_perm->getGroup(), is_atomic);
-		}
-		else
-		{
-			if(group_owned)
-			{
-				perm.setOwnerAndGroup(LLUUID::null, new_owner, new_group, is_atomic);
-			}
-			else if(!new_owner.isNull())
-			{
-				// The object used to be in inventory, so we can
-				// assume the owner and group will match what they are
-				// there.
-				perm.setOwnerAndGroup(LLUUID::null, new_owner, new_group, is_atomic);
-			}
-			// *FIX: can make an even better guess by using the mPermGroup flags
-			else if(permYouOwner())
-			{
-				// best guess.
-				perm.setOwnerAndGroup(LLUUID::null, gAgent.getID(), item->getPermissions().getGroup(), is_atomic);
-				--mExpectedInventorySerialNum;
-			}
-			else
-			{
-				// dummy it up.
-				perm.setOwnerAndGroup(LLUUID::null, LLUUID::null, LLUUID::null, is_atomic);
-				--mExpectedInventorySerialNum;
-			}
-		}
-		LLViewerInventoryItem* oldItem = item;
-		LLViewerInventoryItem* new_item = new LLViewerInventoryItem(oldItem);
-		new_item->setPermissions(perm);
-		mInventory->push_front(new_item);
-		doInventoryCallback();
-		++mExpectedInventorySerialNum;
-	}
-	else if (is_new)
-	{
-		++mExpectedInventorySerialNum;
-	}
+    LLPointer<LLViewerInventoryItem>& item,
+    U8 key,
+    bool is_new)
+{
+    LLViewerInventoryItem* old_item = NULL;
+    if(TASK_INVENTORY_ITEM_KEY == key)
+    {
+        old_item = (LLViewerInventoryItem*)getInventoryObject(item->getUUID());
+    }
+    else if(TASK_INVENTORY_ASSET_KEY == key)
+    {
+        old_item = getInventoryItemByAsset(item->getAssetUUID());
+    }
+    LLUUID item_id;
+    LLUUID new_owner;
+    LLUUID new_group;
+    BOOL group_owned = FALSE;
+    if(old_item)
+    {
+        item_id = old_item->getUUID();
+        new_owner = old_item->getPermissions().getOwner();
+        new_group = old_item->getPermissions().getGroup();
+        group_owned = old_item->getPermissions().isGroupOwned();
+        old_item = NULL;
+    }
+    else
+    {
+        item_id = item->getUUID();
+    }
+    if(!is_new && mInventory)
+    {
+        // Attempt to update the local inventory. If we can get the
+        // object perm, we have perfect visibility, so we want the
+        // serial number to match. Otherwise, take our best guess and
+        // make sure that the serial number does not match.
+        deleteInventoryItem(item_id);
+        LLPermissions perm(item->getPermissions());
+        LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(this);
+        bool is_atomic = ((S32)LLAssetType::AT_OBJECT == item->getType()) ? false : true;
+        if(obj_perm)
+        {
+            perm.setOwnerAndGroup(LLUUID::null, obj_perm->getOwner(), obj_perm->getGroup(), is_atomic);
+        }
+        else
+        {
+            if(group_owned)
+            {
+                perm.setOwnerAndGroup(LLUUID::null, new_owner, new_group, is_atomic);
+            }
+            else if(!new_owner.isNull())
+            {
+                // The object used to be in inventory, so we can
+                // assume the owner and group will match what they are
+                // there.
+                perm.setOwnerAndGroup(LLUUID::null, new_owner, new_group, is_atomic);
+            }
+            // *FIX: can make an even better guess by using the mPermGroup flags
+            else if(permYouOwner())
+            {
+                // best guess.
+                perm.setOwnerAndGroup(LLUUID::null, gAgent.getID(), item->getPermissions().getGroup(), is_atomic);
+                --mExpectedInventorySerialNum;
+            }
+            else
+            {
+                // dummy it up.
+                perm.setOwnerAndGroup(LLUUID::null, LLUUID::null, LLUUID::null, is_atomic);
+                --mExpectedInventorySerialNum;
+            }
+        }
+        LLViewerInventoryItem* oldItem = item;
+        LLViewerInventoryItem* new_item = new LLViewerInventoryItem(oldItem);
+        new_item->setPermissions(perm);
+        mInventory->push_front(new_item);
+        doInventoryCallback();
+        ++mExpectedInventorySerialNum;
+    }
+    else if (is_new)
+    {
+        ++mExpectedInventorySerialNum;
+    }
 }
 
 // save a script, which involves removing the old one, and rezzing
 // in the new one. This method should be called with the asset id
 // of the new and old script AFTER the bytecode has been saved.
 void LLViewerObject::saveScript(
-	const LLViewerInventoryItem* item,
-	BOOL active,
-	bool is_new)
-{
-	/*
-	 * XXXPAM Investigate not making this copy.  Seems unecessary, but I'm unsure about the
-	 * interaction with doUpdateInventory() called below.
-	 */
-	LL_DEBUGS() << "LLViewerObject::saveScript() " << item->getUUID() << " " << item->getAssetUUID() << LL_ENDL;
-
-	LLPointer<LLViewerInventoryItem> task_item =
-		new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
-								  item->getAssetUUID(), item->getType(),
-								  item->getInventoryType(),
-								  item->getName(), item->getDescription(),
-								  item->getSaleInfo(), item->getFlags(),
-								  item->getCreationDate());
-	task_item->setTransactionID(item->getTransactionID());
-
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_RezScript);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
-	msg->nextBlockFast(_PREHASH_UpdateBlock);
-	msg->addU32Fast(_PREHASH_ObjectLocalID, (mLocalID));
-	U8 enabled = active;
-	msg->addBOOLFast(_PREHASH_Enabled, enabled);
-	msg->nextBlockFast(_PREHASH_InventoryBlock);
-	task_item->packMessage(msg);
-	msg->sendReliable(mRegionp->getHost());
-
-	// do the internal logic
-	doUpdateInventory(task_item, TASK_INVENTORY_ITEM_KEY, is_new);
+    const LLViewerInventoryItem* item,
+    BOOL active,
+    bool is_new)
+{
+    /*
+     * XXXPAM Investigate not making this copy.  Seems unecessary, but I'm unsure about the
+     * interaction with doUpdateInventory() called below.
+     */
+    LL_DEBUGS() << "LLViewerObject::saveScript() " << item->getUUID() << " " << item->getAssetUUID() << LL_ENDL;
+
+    LLPointer<LLViewerInventoryItem> task_item =
+        new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+                                  item->getAssetUUID(), item->getType(),
+                                  item->getInventoryType(),
+                                  item->getName(), item->getDescription(),
+                                  item->getSaleInfo(), item->getFlags(),
+                                  item->getCreationDate());
+    task_item->setTransactionID(item->getTransactionID());
+
+    LLMessageSystem* msg = gMessageSystem;
+    msg->newMessageFast(_PREHASH_RezScript);
+    msg->nextBlockFast(_PREHASH_AgentData);
+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
+    msg->nextBlockFast(_PREHASH_UpdateBlock);
+    msg->addU32Fast(_PREHASH_ObjectLocalID, (mLocalID));
+    U8 enabled = active;
+    msg->addBOOLFast(_PREHASH_Enabled, enabled);
+    msg->nextBlockFast(_PREHASH_InventoryBlock);
+    task_item->packMessage(msg);
+    msg->sendReliable(mRegionp->getHost());
+
+    // do the internal logic
+    doUpdateInventory(task_item, TASK_INVENTORY_ITEM_KEY, is_new);
 }
 
 void LLViewerObject::moveInventory(const LLUUID& folder_id,
-								   const LLUUID& item_id)
-{
-	LL_DEBUGS() << "LLViewerObject::moveInventory " << item_id << LL_ENDL;
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_MoveTaskInventory);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_FolderID, folder_id);
-	msg->nextBlockFast(_PREHASH_InventoryData);
-	msg->addU32Fast(_PREHASH_LocalID, mLocalID);
-	msg->addUUIDFast(_PREHASH_ItemID, item_id);
-	msg->sendReliable(mRegionp->getHost());
-
-	LLInventoryObject* inv_obj = getInventoryObject(item_id);
-	if(inv_obj)
-	{
-		LLViewerInventoryItem* item = (LLViewerInventoryItem*)inv_obj;
-		if(!item->getPermissions().allowCopyBy(gAgent.getID()))
-		{
-			deleteInventoryItem(item_id);
-			++mExpectedInventorySerialNum;
-		}
-	}
+                                   const LLUUID& item_id)
+{
+    LL_DEBUGS() << "LLViewerObject::moveInventory " << item_id << LL_ENDL;
+    LLMessageSystem* msg = gMessageSystem;
+    msg->newMessageFast(_PREHASH_MoveTaskInventory);
+    msg->nextBlockFast(_PREHASH_AgentData);
+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->addUUIDFast(_PREHASH_FolderID, folder_id);
+    msg->nextBlockFast(_PREHASH_InventoryData);
+    msg->addU32Fast(_PREHASH_LocalID, mLocalID);
+    msg->addUUIDFast(_PREHASH_ItemID, item_id);
+    msg->sendReliable(mRegionp->getHost());
+
+    LLInventoryObject* inv_obj = getInventoryObject(item_id);
+    if(inv_obj)
+    {
+        LLViewerInventoryItem* item = (LLViewerInventoryItem*)inv_obj;
+        if(!item->getPermissions().allowCopyBy(gAgent.getID()))
+        {
+            deleteInventoryItem(item_id);
+            ++mExpectedInventorySerialNum;
+        }
+    }
 }
 
 void LLViewerObject::dirtyInventory()
 {
-	// If there aren't any LLVOInventoryListeners, we won't be
-	// able to update our mInventory when it comes back from the
-	// simulator, so we should not clear the inventory either.
-	if(mInventory && !mInventoryCallbacks.empty())
-	{
-		mInventory->clear(); // will deref and delete entries
-		delete mInventory;
-		mInventory = NULL;
-	}
-	mInventoryDirty = TRUE;
+    // If there aren't any LLVOInventoryListeners, we won't be
+    // able to update our mInventory when it comes back from the
+    // simulator, so we should not clear the inventory either.
+    if(mInventory && !mInventoryCallbacks.empty())
+    {
+        mInventory->clear(); // will deref and delete entries
+        delete mInventory;
+        mInventory = NULL;
+    }
+    mInventoryDirty = TRUE;
 }
 
 void LLViewerObject::registerInventoryListener(LLVOInventoryListener* listener, void* user_data)
 {
-	LLInventoryCallbackInfo* info = new LLInventoryCallbackInfo;
-	info->mListener = listener;
-	info->mInventoryData = user_data;
-	mInventoryCallbacks.push_front(info);
+    LLInventoryCallbackInfo* info = new LLInventoryCallbackInfo;
+    info->mListener = listener;
+    info->mInventoryData = user_data;
+    mInventoryCallbacks.push_front(info);
 }
 
 void LLViewerObject::removeInventoryListener(LLVOInventoryListener* listener)
 {
-	if (listener == NULL)
-		return;
-	for (callback_list_t::iterator iter = mInventoryCallbacks.begin();
-		 iter != mInventoryCallbacks.end(); )
-	{
-		callback_list_t::iterator curiter = iter++;
-		LLInventoryCallbackInfo* info = *curiter;
-		if (info->mListener == listener)
-		{
-			delete info;
-			mInventoryCallbacks.erase(curiter);
-			break;
-		}
-	}
+    if (listener == NULL)
+        return;
+    for (callback_list_t::iterator iter = mInventoryCallbacks.begin();
+         iter != mInventoryCallbacks.end(); )
+    {
+        callback_list_t::iterator curiter = iter++;
+        LLInventoryCallbackInfo* info = *curiter;
+        if (info->mListener == listener)
+        {
+            delete info;
+            mInventoryCallbacks.erase(curiter);
+            break;
+        }
+    }
 }
 
 BOOL LLViewerObject::isInventoryPending()
@@ -2995,60 +2995,60 @@ BOOL LLViewerObject::isInventoryPending()
 
 void LLViewerObject::clearInventoryListeners()
 {
-	for_each(mInventoryCallbacks.begin(), mInventoryCallbacks.end(), DeletePointer());
-	mInventoryCallbacks.clear();
+    for_each(mInventoryCallbacks.begin(), mInventoryCallbacks.end(), DeletePointer());
+    mInventoryCallbacks.clear();
 }
 
 bool LLViewerObject::hasInventoryListeners()
 {
-	return !mInventoryCallbacks.empty();
+    return !mInventoryCallbacks.empty();
 }
 
 void LLViewerObject::requestInventory()
 {
-	if(mInventoryDirty && mInventory && !mInventoryCallbacks.empty())
-	{
-		mInventory->clear(); // will deref and delete entries
-		delete mInventory;
-		mInventory = NULL;
-	}
-
-	if(mInventory)
-	{
-		// inventory is either up to date or doesn't has a listener
-		// if it is dirty, leave it this way in case we gain a listener
-		doInventoryCallback();
-	}
-	else
-	{
-		// since we are going to request it now
-		mInventoryDirty = FALSE;
-
-		// Note: throws away duplicate requests
-		fetchInventoryFromServer();
-	}
+    if(mInventoryDirty && mInventory && !mInventoryCallbacks.empty())
+    {
+        mInventory->clear(); // will deref and delete entries
+        delete mInventory;
+        mInventory = NULL;
+    }
+
+    if(mInventory)
+    {
+        // inventory is either up to date or doesn't has a listener
+        // if it is dirty, leave it this way in case we gain a listener
+        doInventoryCallback();
+    }
+    else
+    {
+        // since we are going to request it now
+        mInventoryDirty = FALSE;
+
+        // Note: throws away duplicate requests
+        fetchInventoryFromServer();
+    }
 }
 
 void LLViewerObject::fetchInventoryFromServer()
 {
-	if (!isInventoryPending())
-	{
-		delete mInventory;
-		mInventory = NULL;
-
-		// Results in processTaskInv
-		LLMessageSystem* msg = gMessageSystem;
-		msg->newMessageFast(_PREHASH_RequestTaskInventory);
-		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->nextBlockFast(_PREHASH_InventoryData);
-		msg->addU32Fast(_PREHASH_LocalID, mLocalID);
-		msg->sendReliable(mRegionp->getHost());
-
-		// This will get reset by doInventoryCallback or processTaskInv
-		mInvRequestState = INVENTORY_REQUEST_PENDING;
-	}
+    if (!isInventoryPending())
+    {
+        delete mInventory;
+        mInventory = NULL;
+
+        // Results in processTaskInv
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_RequestTaskInventory);
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->nextBlockFast(_PREHASH_InventoryData);
+        msg->addU32Fast(_PREHASH_LocalID, mLocalID);
+        msg->sendReliable(mRegionp->getHost());
+
+        // This will get reset by doInventoryCallback or processTaskInv
+        mInvRequestState = INVENTORY_REQUEST_PENDING;
+    }
 }
 
 void LLViewerObject::fetchInventoryDelayed(const F64 &time_seconds)
@@ -3164,8 +3164,8 @@ void LLViewerObject::linkControlAvatar()
             return;
         }
         mControlAvatar = LLControlAvatar::createControlAvatar(volp);
-        LL_DEBUGS("AnimatedObjects") << volp->getID() 
-                                     << " created control av for " 
+        LL_DEBUGS("AnimatedObjects") << volp->getID()
+                                     << " created control av for "
                                      << (S32) (1+volp->numChildren()) << " prims" << LL_ENDL;
     }
     LLControlAvatar *cav = getControlAvatar();
@@ -3215,26 +3215,26 @@ bool LLViewerObject::isAnimatedObject() const
 
 struct LLFilenameAndTask
 {
-	LLUUID mTaskID;
-	std::string mFilename;
+    LLUUID mTaskID;
+    std::string mFilename;
 
-	// for sequencing in case of multiple updates
-	S16 mSerial;
+    // for sequencing in case of multiple updates
+    S16 mSerial;
 #ifdef _DEBUG
-	static S32 sCount;
-	LLFilenameAndTask()
-	{
-		++sCount;
-		LL_DEBUGS() << "Constructing LLFilenameAndTask: " << sCount << LL_ENDL;
-	}
-	~LLFilenameAndTask()
-	{
-		--sCount;
-		LL_DEBUGS() << "Destroying LLFilenameAndTask: " << sCount << LL_ENDL;
-	}
+    static S32 sCount;
+    LLFilenameAndTask()
+    {
+        ++sCount;
+        LL_DEBUGS() << "Constructing LLFilenameAndTask: " << sCount << LL_ENDL;
+    }
+    ~LLFilenameAndTask()
+    {
+        --sCount;
+        LL_DEBUGS() << "Destroying LLFilenameAndTask: " << sCount << LL_ENDL;
+    }
 private:
-	LLFilenameAndTask(const LLFilenameAndTask& rhs);
-	const LLFilenameAndTask& operator=(const LLFilenameAndTask& rhs) const;
+    LLFilenameAndTask(const LLFilenameAndTask& rhs);
+    const LLFilenameAndTask& operator=(const LLFilenameAndTask& rhs) const;
 #endif
 };
 
@@ -3287,7 +3287,7 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
         LLFilenameAndTask* ft = new LLFilenameAndTask;
         ft->mTaskID = task_id;
         ft->mSerial = serial;
-        
+
         // We received version we expected or newer. Load it.
         object->mInventorySerialNum = ft->mSerial;
         object->mExpectedInventorySerialNum = ft->mSerial;
@@ -3343,154 +3343,154 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
 
 void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtStat ext_status)
 {
-	LLFilenameAndTask* ft = (LLFilenameAndTask*)user_data;
-	LLViewerObject* object = NULL;
-
-	if (ft
-		&& (0 == error_code)
-		&& (object = gObjectList.findObject(ft->mTaskID))
-		&& ft->mSerial >= object->mInventorySerialNum)
-	{
-		object->mInventorySerialNum = ft->mSerial;
-		LL_DEBUGS() << "Receiving inventory task file for serial " << object->mInventorySerialNum << " taskid: " << ft->mTaskID << LL_ENDL;
-		if (ft->mSerial < object->mExpectedInventorySerialNum)
-		{
-			// User managed to change something while inventory was loading
-			LL_DEBUGS() << "Processing file that is potentially out of date for task: " << ft->mTaskID << LL_ENDL;
-		}
-
-		if (object->loadTaskInvFile(ft->mFilename))
-		{
-
-			LLInventoryObject::object_list_t::iterator it = object->mInventory->begin();
-			LLInventoryObject::object_list_t::iterator end = object->mInventory->end();
-			std::list<LLUUID>& pending_lst = object->mPendingInventoryItemsIDs;
-
-			for (; it != end && pending_lst.size(); ++it)
-			{
-				LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
-				if(item && item->getType() != LLAssetType::AT_CATEGORY)
-				{
-					std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
-					if (id_it != pending_lst.end())
-					{
-						pending_lst.erase(id_it);
-					}
-				}
-			}
-		}
-		else
-		{
-			// MAINT-2597 - crash when trying to edit a no-mod object
-			// Somehow get an contents inventory response, but with an invalid stream (possibly 0 size?)
-			// Stated repro was specific to no-mod objects so failing without user interaction should be safe.
-			LL_WARNS() << "Trying to load invalid task inventory file. Ignoring file contents." << LL_ENDL;
-		}
-	}
-	else
-	{
-		// This Occurs When two requests were made, and the first one
-		// has already handled it.
-		LL_DEBUGS() << "Problem loading task inventory. Return code: "
-				 << error_code << LL_ENDL;
-	}
-	delete ft;
+    LLFilenameAndTask* ft = (LLFilenameAndTask*)user_data;
+    LLViewerObject* object = NULL;
+
+    if (ft
+        && (0 == error_code)
+        && (object = gObjectList.findObject(ft->mTaskID))
+        && ft->mSerial >= object->mInventorySerialNum)
+    {
+        object->mInventorySerialNum = ft->mSerial;
+        LL_DEBUGS() << "Receiving inventory task file for serial " << object->mInventorySerialNum << " taskid: " << ft->mTaskID << LL_ENDL;
+        if (ft->mSerial < object->mExpectedInventorySerialNum)
+        {
+            // User managed to change something while inventory was loading
+            LL_DEBUGS() << "Processing file that is potentially out of date for task: " << ft->mTaskID << LL_ENDL;
+        }
+
+        if (object->loadTaskInvFile(ft->mFilename))
+        {
+
+            LLInventoryObject::object_list_t::iterator it = object->mInventory->begin();
+            LLInventoryObject::object_list_t::iterator end = object->mInventory->end();
+            std::list<LLUUID>& pending_lst = object->mPendingInventoryItemsIDs;
+
+            for (; it != end && pending_lst.size(); ++it)
+            {
+                LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(it->get());
+                if(item && item->getType() != LLAssetType::AT_CATEGORY)
+                {
+                    std::list<LLUUID>::iterator id_it = std::find(pending_lst.begin(), pending_lst.begin(), item->getAssetUUID());
+                    if (id_it != pending_lst.end())
+                    {
+                        pending_lst.erase(id_it);
+                    }
+                }
+            }
+        }
+        else
+        {
+            // MAINT-2597 - crash when trying to edit a no-mod object
+            // Somehow get an contents inventory response, but with an invalid stream (possibly 0 size?)
+            // Stated repro was specific to no-mod objects so failing without user interaction should be safe.
+            LL_WARNS() << "Trying to load invalid task inventory file. Ignoring file contents." << LL_ENDL;
+        }
+    }
+    else
+    {
+        // This Occurs When two requests were made, and the first one
+        // has already handled it.
+        LL_DEBUGS() << "Problem loading task inventory. Return code: "
+                 << error_code << LL_ENDL;
+    }
+    delete ft;
 }
 
 BOOL LLViewerObject::loadTaskInvFile(const std::string& filename)
 {
-	std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename);
-	llifstream ifs(filename_and_local_path.c_str());
-	if(ifs.good())
-	{
-		U32 fail_count = 0;
-		char buffer[MAX_STRING];	/* Flawfinder: ignore */
-		// *NOTE: This buffer size is hard coded into scanf() below.
-		char keyword[MAX_STRING];	/* Flawfinder: ignore */
-		if(mInventory)
-		{
-			mInventory->clear(); // will deref and delete it
-		}
-		else
-		{
-			mInventory = new LLInventoryObject::object_list_t;
-		}
-		while(ifs.good())
-		{
-			ifs.getline(buffer, MAX_STRING);
-			if (sscanf(buffer, " %254s", keyword) == EOF) /* Flawfinder: ignore */
-			{
-				// Blank file?
-				LL_WARNS() << "Issue reading from file '"
-						<< filename << "'" << LL_ENDL;
-				break;
-			}
-			else if(0 == strcmp("inv_item", keyword))
-			{
-				LLPointer<LLInventoryObject> inv = new LLViewerInventoryItem;
-				inv->importLegacyStream(ifs);
-				mInventory->push_front(inv);
-			}
-			else if(0 == strcmp("inv_object", keyword))
-			{
-				LLPointer<LLInventoryObject> inv = new LLInventoryObject;
-				inv->importLegacyStream(ifs);
-				inv->rename("Contents");
-				mInventory->push_front(inv);
-			}
-			else if (fail_count >= MAX_INV_FILE_READ_FAILS)
-			{
-				LL_WARNS() << "Encountered too many unknowns while reading from file: '"
-						<< filename << "'" << LL_ENDL;
-				break;
-			}
-			else
-			{
-				// Is there really a point to continue processing? We already failing to display full inventory
-				fail_count++;
-				LL_WARNS_ONCE() << "Unknown token while reading from inventory file. Token: '"
-						<< keyword << "'" << LL_ENDL;
-			}
-		}
-		ifs.close();
-		LLFile::remove(filename_and_local_path);
-	}
-	else
-	{
-		LL_WARNS() << "unable to load task inventory: " << filename_and_local_path
-				<< LL_ENDL;
-		return FALSE;
-	}
-	doInventoryCallback();
-
-	return TRUE;
+    std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename);
+    llifstream ifs(filename_and_local_path.c_str());
+    if(ifs.good())
+    {
+        U32 fail_count = 0;
+        char buffer[MAX_STRING];    /* Flawfinder: ignore */
+        // *NOTE: This buffer size is hard coded into scanf() below.
+        char keyword[MAX_STRING];   /* Flawfinder: ignore */
+        if(mInventory)
+        {
+            mInventory->clear(); // will deref and delete it
+        }
+        else
+        {
+            mInventory = new LLInventoryObject::object_list_t;
+        }
+        while(ifs.good())
+        {
+            ifs.getline(buffer, MAX_STRING);
+            if (sscanf(buffer, " %254s", keyword) == EOF) /* Flawfinder: ignore */
+            {
+                // Blank file?
+                LL_WARNS() << "Issue reading from file '"
+                        << filename << "'" << LL_ENDL;
+                break;
+            }
+            else if(0 == strcmp("inv_item", keyword))
+            {
+                LLPointer<LLInventoryObject> inv = new LLViewerInventoryItem;
+                inv->importLegacyStream(ifs);
+                mInventory->push_front(inv);
+            }
+            else if(0 == strcmp("inv_object", keyword))
+            {
+                LLPointer<LLInventoryObject> inv = new LLInventoryObject;
+                inv->importLegacyStream(ifs);
+                inv->rename("Contents");
+                mInventory->push_front(inv);
+            }
+            else if (fail_count >= MAX_INV_FILE_READ_FAILS)
+            {
+                LL_WARNS() << "Encountered too many unknowns while reading from file: '"
+                        << filename << "'" << LL_ENDL;
+                break;
+            }
+            else
+            {
+                // Is there really a point to continue processing? We already failing to display full inventory
+                fail_count++;
+                LL_WARNS_ONCE() << "Unknown token while reading from inventory file. Token: '"
+                        << keyword << "'" << LL_ENDL;
+            }
+        }
+        ifs.close();
+        LLFile::remove(filename_and_local_path);
+    }
+    else
+    {
+        LL_WARNS() << "unable to load task inventory: " << filename_and_local_path
+                << LL_ENDL;
+        return FALSE;
+    }
+    doInventoryCallback();
+
+    return TRUE;
 }
 
 void LLViewerObject::doInventoryCallback()
 {
-	for (callback_list_t::iterator iter = mInventoryCallbacks.begin();
-		 iter != mInventoryCallbacks.end(); )
-	{
-		callback_list_t::iterator curiter = iter++;
-		LLInventoryCallbackInfo* info = *curiter;
-		if (info->mListener != NULL)
-		{
-			info->mListener->inventoryChanged(this,
-								 mInventory,
-								 mInventorySerialNum,
-								 info->mInventoryData);
-		}
-		else
-		{
-			LL_INFOS() << "LLViewerObject::doInventoryCallback() deleting bad listener entry." << LL_ENDL;
-			delete info;
-			mInventoryCallbacks.erase(curiter);
-		}
-	}
-
-	// release inventory loading state
-	mInvRequestXFerId = 0;
-	mInvRequestState = INVENTORY_REQUEST_STOPPED;
+    for (callback_list_t::iterator iter = mInventoryCallbacks.begin();
+         iter != mInventoryCallbacks.end(); )
+    {
+        callback_list_t::iterator curiter = iter++;
+        LLInventoryCallbackInfo* info = *curiter;
+        if (info->mListener != NULL)
+        {
+            info->mListener->inventoryChanged(this,
+                                 mInventory,
+                                 mInventorySerialNum,
+                                 info->mInventoryData);
+        }
+        else
+        {
+            LL_INFOS() << "LLViewerObject::doInventoryCallback() deleting bad listener entry." << LL_ENDL;
+            delete info;
+            mInventoryCallbacks.erase(curiter);
+        }
+    }
+
+    // release inventory loading state
+    mInvRequestXFerId = 0;
+    mInvRequestState = INVENTORY_REQUEST_STOPPED;
 }
 
 void LLViewerObject::removeInventory(const LLUUID& item_id)
@@ -3501,17 +3501,17 @@ void LLViewerObject::removeInventory(const LLUUID& item_id)
     params["object"] = mID;
     LLFloaterReg::hideInstance("item_properties", params);
 
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_RemoveTaskInventory);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->nextBlockFast(_PREHASH_InventoryData);
-	msg->addU32Fast(_PREHASH_LocalID, mLocalID);
-	msg->addUUIDFast(_PREHASH_ItemID, item_id);
-	msg->sendReliable(mRegionp->getHost());
-	deleteInventoryItem(item_id);
-	++mExpectedInventorySerialNum;
+    LLMessageSystem* msg = gMessageSystem;
+    msg->newMessageFast(_PREHASH_RemoveTaskInventory);
+    msg->nextBlockFast(_PREHASH_AgentData);
+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->nextBlockFast(_PREHASH_InventoryData);
+    msg->addU32Fast(_PREHASH_LocalID, mLocalID);
+    msg->addUUIDFast(_PREHASH_ItemID, item_id);
+    msg->sendReliable(mRegionp->getHost());
+    deleteInventoryItem(item_id);
+    ++mExpectedInventorySerialNum;
 }
 
 bool LLViewerObject::isAssetInInventory(LLViewerInventoryItem* item, LLAssetType::EType type)
@@ -3563,136 +3563,136 @@ void LLViewerObject::updateMaterialInventory(LLViewerInventoryItem* item, U8 key
 }
 
 void LLViewerObject::updateInventory(
-	LLViewerInventoryItem* item,
-	U8 key,
-	bool is_new)
-{
-	// This slices the object into what we're concerned about on the
-	// viewer. The simulator will take the permissions and transfer
-	// ownership.
-	LLPointer<LLViewerInventoryItem> task_item =
-		new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
-								  item->getAssetUUID(), item->getType(),
-								  item->getInventoryType(),
-								  item->getName(), item->getDescription(),
-								  item->getSaleInfo(),
-								  item->getFlags(),
-								  item->getCreationDate());
-	task_item->setTransactionID(item->getTransactionID());
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_UpdateTaskInventory);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->nextBlockFast(_PREHASH_UpdateData);
-	msg->addU32Fast(_PREHASH_LocalID, mLocalID);
-	msg->addU8Fast(_PREHASH_Key, key);
-	msg->nextBlockFast(_PREHASH_InventoryData);
-	task_item->packMessage(msg);
-	msg->sendReliable(mRegionp->getHost());
-
-	// do the internal logic
-	doUpdateInventory(task_item, key, is_new);
+    LLViewerInventoryItem* item,
+    U8 key,
+    bool is_new)
+{
+    // This slices the object into what we're concerned about on the
+    // viewer. The simulator will take the permissions and transfer
+    // ownership.
+    LLPointer<LLViewerInventoryItem> task_item =
+        new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+                                  item->getAssetUUID(), item->getType(),
+                                  item->getInventoryType(),
+                                  item->getName(), item->getDescription(),
+                                  item->getSaleInfo(),
+                                  item->getFlags(),
+                                  item->getCreationDate());
+    task_item->setTransactionID(item->getTransactionID());
+    LLMessageSystem* msg = gMessageSystem;
+    msg->newMessageFast(_PREHASH_UpdateTaskInventory);
+    msg->nextBlockFast(_PREHASH_AgentData);
+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->nextBlockFast(_PREHASH_UpdateData);
+    msg->addU32Fast(_PREHASH_LocalID, mLocalID);
+    msg->addU8Fast(_PREHASH_Key, key);
+    msg->nextBlockFast(_PREHASH_InventoryData);
+    task_item->packMessage(msg);
+    msg->sendReliable(mRegionp->getHost());
+
+    // do the internal logic
+    doUpdateInventory(task_item, key, is_new);
 }
 
 void LLViewerObject::updateInventoryLocal(LLInventoryItem* item, U8 key)
 {
-	LLPointer<LLViewerInventoryItem> task_item =
-		new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
-								  item->getAssetUUID(), item->getType(),
-								  item->getInventoryType(),
-								  item->getName(), item->getDescription(),
-								  item->getSaleInfo(), item->getFlags(),
-								  item->getCreationDate());
+    LLPointer<LLViewerInventoryItem> task_item =
+        new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+                                  item->getAssetUUID(), item->getType(),
+                                  item->getInventoryType(),
+                                  item->getName(), item->getDescription(),
+                                  item->getSaleInfo(), item->getFlags(),
+                                  item->getCreationDate());
 
-	// do the internal logic
-	const bool is_new = false;
-	doUpdateInventory(task_item, key, is_new);
+    // do the internal logic
+    const bool is_new = false;
+    doUpdateInventory(task_item, key, is_new);
 }
 
 LLInventoryObject* LLViewerObject::getInventoryObject(const LLUUID& item_id)
 {
-	LLInventoryObject* rv = NULL;
-	if(mInventory)
-	{
-		LLInventoryObject::object_list_t::iterator it = mInventory->begin();
-		LLInventoryObject::object_list_t::iterator end = mInventory->end();
-		for ( ; it != end; ++it)
-		{
-			if((*it)->getUUID() == item_id)
-			{
-				rv = *it;
-				break;
-			}
-		}		
-	}
-	return rv;
+    LLInventoryObject* rv = NULL;
+    if(mInventory)
+    {
+        LLInventoryObject::object_list_t::iterator it = mInventory->begin();
+        LLInventoryObject::object_list_t::iterator end = mInventory->end();
+        for ( ; it != end; ++it)
+        {
+            if((*it)->getUUID() == item_id)
+            {
+                rv = *it;
+                break;
+            }
+        }
+    }
+    return rv;
 }
 
 LLInventoryItem* LLViewerObject::getInventoryItem(const LLUUID& item_id)
 {
-	LLInventoryObject* iobj = getInventoryObject(item_id);
-	if (!iobj || iobj->getType() == LLAssetType::AT_CATEGORY)
-	{
-		return NULL;
-	}
-	LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(iobj);
-	return item;
+    LLInventoryObject* iobj = getInventoryObject(item_id);
+    if (!iobj || iobj->getType() == LLAssetType::AT_CATEGORY)
+    {
+        return NULL;
+    }
+    LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(iobj);
+    return item;
 }
 
 void LLViewerObject::getInventoryContents(LLInventoryObject::object_list_t& objects)
 {
-	if(mInventory)
-	{
-		LLInventoryObject::object_list_t::iterator it = mInventory->begin();
-		LLInventoryObject::object_list_t::iterator end = mInventory->end();
-		for( ; it != end; ++it)
-		{
-			if ((*it)->getType() != LLAssetType::AT_CATEGORY)
-			{
-				objects.push_back(*it);
-			}
-		}
-	}
+    if(mInventory)
+    {
+        LLInventoryObject::object_list_t::iterator it = mInventory->begin();
+        LLInventoryObject::object_list_t::iterator end = mInventory->end();
+        for( ; it != end; ++it)
+        {
+            if ((*it)->getType() != LLAssetType::AT_CATEGORY)
+            {
+                objects.push_back(*it);
+            }
+        }
+    }
 }
 
 LLInventoryObject* LLViewerObject::getInventoryRoot()
 {
-	if (!mInventory || !mInventory->size())
-	{
-		return NULL;
-	}
-	return mInventory->back();
+    if (!mInventory || !mInventory->size())
+    {
+        return NULL;
+    }
+    return mInventory->back();
 }
 
 LLViewerInventoryItem* LLViewerObject::getInventoryItemByAsset(const LLUUID& asset_id)
 {
-	if (mInventoryDirty)
-		LL_WARNS() << "Peforming inventory lookup for object " << mID << " that has dirty inventory!" << LL_ENDL;
-
-	LLViewerInventoryItem* rv = NULL;
-	if(mInventory)
-	{
-		LLViewerInventoryItem* item = NULL;
-
-		LLInventoryObject::object_list_t::iterator it = mInventory->begin();
-		LLInventoryObject::object_list_t::iterator end = mInventory->end();
-		for( ; it != end; ++it)
-		{
-			LLInventoryObject* obj = *it;
-			if(obj->getType() != LLAssetType::AT_CATEGORY)
-			{
-				// *FIX: gank-ass down cast!
-				item = (LLViewerInventoryItem*)obj;
-				if(item->getAssetUUID() == asset_id)
-				{
-					rv = item;
-					break;
-				}
-			}
-		}		
-	}
-	return rv;
+    if (mInventoryDirty)
+        LL_WARNS() << "Peforming inventory lookup for object " << mID << " that has dirty inventory!" << LL_ENDL;
+
+    LLViewerInventoryItem* rv = NULL;
+    if(mInventory)
+    {
+        LLViewerInventoryItem* item = NULL;
+
+        LLInventoryObject::object_list_t::iterator it = mInventory->begin();
+        LLInventoryObject::object_list_t::iterator end = mInventory->end();
+        for( ; it != end; ++it)
+        {
+            LLInventoryObject* obj = *it;
+            if(obj->getType() != LLAssetType::AT_CATEGORY)
+            {
+                // *FIX: gank-ass down cast!
+                item = (LLViewerInventoryItem*)obj;
+                if(item->getAssetUUID() == asset_id)
+                {
+                    rv = item;
+                    break;
+                }
+            }
+        }
+    }
+    return rv;
 }
 
 LLViewerInventoryItem* LLViewerObject::getInventoryItemByAsset(const LLUUID& asset_id, LLAssetType::EType type)
@@ -3734,70 +3734,70 @@ LLViewerInventoryItem* LLViewerObject::getInventoryItemByAsset(const LLUUID& ass
 }
 
 void LLViewerObject::updateViewerInventoryAsset(
-					const LLViewerInventoryItem* item,
-					const LLUUID& new_asset)
+                    const LLViewerInventoryItem* item,
+                    const LLUUID& new_asset)
 {
-	LLPointer<LLViewerInventoryItem> task_item =
-		new LLViewerInventoryItem(item);
-	task_item->setAssetUUID(new_asset);
+    LLPointer<LLViewerInventoryItem> task_item =
+        new LLViewerInventoryItem(item);
+    task_item->setAssetUUID(new_asset);
 
-	// do the internal logic
-	doUpdateInventory(task_item, TASK_INVENTORY_ITEM_KEY, false);
+    // do the internal logic
+    doUpdateInventory(task_item, TASK_INVENTORY_ITEM_KEY, false);
 }
 
 void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
 {
-	if (getVolume())
-	{	//volumes calculate pixel area and angle per face
-		return;
-	}
-	
-	LLVector3 viewer_pos_agent = gAgentCamera.getCameraPositionAgent();
-	LLVector3 pos_agent = getRenderPosition();
-
-	F32 dx = viewer_pos_agent.mV[VX] - pos_agent.mV[VX];
-	F32 dy = viewer_pos_agent.mV[VY] - pos_agent.mV[VY];
-	F32 dz = viewer_pos_agent.mV[VZ] - pos_agent.mV[VZ];
-
-	F32 max_scale = getMaxScale();
-	F32 mid_scale = getMidScale();
-	F32 min_scale = getMinScale();
-
-	// IW: estimate - when close to large objects, computing range based on distance from center is no good
-	// to try to get a min distance from face, subtract min_scale/2 from the range.
-	// This means we'll load too much detail sometimes, but that's better than not enough
-	// I don't think there's a better way to do this without calculating distance per-poly
-	F32 range = sqrt(dx*dx + dy*dy + dz*dz) - min_scale/2;
-
-	LLViewerCamera* camera = LLViewerCamera::getInstance();
-	if (range < 0.001f || isHUDAttachment())		// range == zero
-	{
-		mAppAngle = 180.f;
-		mPixelArea = (F32)camera->getScreenPixelArea();
-	}
-	else
-	{
-		mAppAngle = (F32) atan2( max_scale, range) * RAD_TO_DEG;
-
-		F32 pixels_per_meter = camera->getPixelMeterRatio() / range;
-
-		mPixelArea = (pixels_per_meter * max_scale) * (pixels_per_meter * mid_scale);
-		if (mPixelArea > camera->getScreenPixelArea())
-		{
-			mAppAngle = 180.f;
-			mPixelArea = (F32)camera->getScreenPixelArea();
-		}
-	}
+    if (getVolume())
+    {   //volumes calculate pixel area and angle per face
+        return;
+    }
+
+    LLVector3 viewer_pos_agent = gAgentCamera.getCameraPositionAgent();
+    LLVector3 pos_agent = getRenderPosition();
+
+    F32 dx = viewer_pos_agent.mV[VX] - pos_agent.mV[VX];
+    F32 dy = viewer_pos_agent.mV[VY] - pos_agent.mV[VY];
+    F32 dz = viewer_pos_agent.mV[VZ] - pos_agent.mV[VZ];
+
+    F32 max_scale = getMaxScale();
+    F32 mid_scale = getMidScale();
+    F32 min_scale = getMinScale();
+
+    // IW: estimate - when close to large objects, computing range based on distance from center is no good
+    // to try to get a min distance from face, subtract min_scale/2 from the range.
+    // This means we'll load too much detail sometimes, but that's better than not enough
+    // I don't think there's a better way to do this without calculating distance per-poly
+    F32 range = sqrt(dx*dx + dy*dy + dz*dz) - min_scale/2;
+
+    LLViewerCamera* camera = LLViewerCamera::getInstance();
+    if (range < 0.001f || isHUDAttachment())        // range == zero
+    {
+        mAppAngle = 180.f;
+        mPixelArea = (F32)camera->getScreenPixelArea();
+    }
+    else
+    {
+        mAppAngle = (F32) atan2( max_scale, range) * RAD_TO_DEG;
+
+        F32 pixels_per_meter = camera->getPixelMeterRatio() / range;
+
+        mPixelArea = (pixels_per_meter * max_scale) * (pixels_per_meter * mid_scale);
+        if (mPixelArea > camera->getScreenPixelArea())
+        {
+            mAppAngle = 180.f;
+            mPixelArea = (F32)camera->getScreenPixelArea();
+        }
+    }
 }
 
 BOOL LLViewerObject::updateLOD()
 {
-	return FALSE;
+    return FALSE;
 }
 
 BOOL LLViewerObject::updateGeometry(LLDrawable *drawable)
 {
-	return TRUE;
+    return TRUE;
 }
 
 void LLViewerObject::updateGL()
@@ -3807,51 +3807,51 @@ void LLViewerObject::updateGL()
 
 void LLViewerObject::updateFaceSize(S32 idx)
 {
-	
+
 }
 
 LLDrawable* LLViewerObject::createDrawable(LLPipeline *pipeline)
 {
-	return NULL;
+    return NULL;
 }
 
 void LLViewerObject::setScale(const LLVector3 &scale, BOOL damped)
 {
-	LLPrimitive::setScale(scale);
-	if (mDrawable.notNull())
-	{
-		//encompass completely sheared objects by taking 
-		//the most extreme point possible (<1,1,0.5>)
-		mDrawable->setRadius(LLVector3(1,1,0.5f).scaleVec(scale).magVec());
-		updateDrawable(damped);
-	}
-
-	if( (LL_PCODE_VOLUME == getPCode()) && !isDead() )
-	{
-		if (permYouOwner() || (scale.magVecSquared() > (7.5f * 7.5f)) )
-		{
-			if (!mOnMap)
-			{
-				llassert_always(LLWorld::getInstance()->getRegionFromHandle(getRegion()->getHandle()));
-
-				gObjectList.addToMap(this);
-				mOnMap = TRUE;
-			}
-		}
-		else
-		{
-			if (mOnMap)
-			{
-				gObjectList.removeFromMap(this);
-				mOnMap = FALSE;
-			}
-		}
-	}
+    LLPrimitive::setScale(scale);
+    if (mDrawable.notNull())
+    {
+        //encompass completely sheared objects by taking
+        //the most extreme point possible (<1,1,0.5>)
+        mDrawable->setRadius(LLVector3(1,1,0.5f).scaleVec(scale).magVec());
+        updateDrawable(damped);
+    }
+
+    if( (LL_PCODE_VOLUME == getPCode()) && !isDead() )
+    {
+        if (permYouOwner() || (scale.magVecSquared() > (7.5f * 7.5f)) )
+        {
+            if (!mOnMap)
+            {
+                llassert_always(LLWorld::getInstance()->getRegionFromHandle(getRegion()->getHandle()));
+
+                gObjectList.addToMap(this);
+                mOnMap = TRUE;
+            }
+        }
+        else
+        {
+            if (mOnMap)
+            {
+                gObjectList.removeFromMap(this);
+                mOnMap = FALSE;
+            }
+        }
+    }
 }
 
 void LLViewerObject::setObjectCostStale()
 {
-	mCostStale = true;
+    mCostStale = true;
     // *NOTE: This is harmlessly redundant for Blinn-Phong material updates, as
     // the root prim currently gets set stale anyway due to other property
     // updates. But it is needed for GLTF material ID updates.
@@ -3861,96 +3861,96 @@ void LLViewerObject::setObjectCostStale()
 
 void LLViewerObject::setObjectCost(F32 cost)
 {
-	mObjectCost = cost;
-	mCostStale = false;
+    mObjectCost = cost;
+    mCostStale = false;
 
-	if (isSelected())
-	{
-		gFloaterTools->dirty();
-	}
+    if (isSelected())
+    {
+        gFloaterTools->dirty();
+    }
 }
 
 void LLViewerObject::setLinksetCost(F32 cost)
 {
-	mLinksetCost = cost;
-	mCostStale = false;
+    mLinksetCost = cost;
+    mCostStale = false;
 
-	BOOL needs_refresh = isSelected();
-	child_list_t::iterator iter = mChildList.begin();
-	while(iter != mChildList.end() && !needs_refresh)
-	{
-		LLViewerObject* child = *iter;
-		needs_refresh = child->isSelected();
-		iter++;
-	}
+    BOOL needs_refresh = isSelected();
+    child_list_t::iterator iter = mChildList.begin();
+    while(iter != mChildList.end() && !needs_refresh)
+    {
+        LLViewerObject* child = *iter;
+        needs_refresh = child->isSelected();
+        iter++;
+    }
 
-	if (needs_refresh)
-	{
-		gFloaterTools->dirty();
-	}
+    if (needs_refresh)
+    {
+        gFloaterTools->dirty();
+    }
 }
 
 void LLViewerObject::setPhysicsCost(F32 cost)
 {
-	mPhysicsCost = cost;
-	mCostStale = false;
+    mPhysicsCost = cost;
+    mCostStale = false;
 
-	if (isSelected())
-	{
-		gFloaterTools->dirty();
-	}
+    if (isSelected())
+    {
+        gFloaterTools->dirty();
+    }
 }
 
 void LLViewerObject::setLinksetPhysicsCost(F32 cost)
 {
-	mLinksetPhysicsCost = cost;
-	mCostStale = false;
-	
-	if (isSelected())
-	{
-		gFloaterTools->dirty();
-	}
+    mLinksetPhysicsCost = cost;
+    mCostStale = false;
+
+    if (isSelected())
+    {
+        gFloaterTools->dirty();
+    }
 }
 
 
 F32 LLViewerObject::getObjectCost()
 {
-	if (mCostStale)
-	{
-		gObjectList.updateObjectCost(this);
-	}
-	
-	return mObjectCost;
+    if (mCostStale)
+    {
+        gObjectList.updateObjectCost(this);
+    }
+
+    return mObjectCost;
 }
 
 F32 LLViewerObject::getLinksetCost()
 {
-	if (mCostStale)
-	{
-		gObjectList.updateObjectCost(this);
-	}
+    if (mCostStale)
+    {
+        gObjectList.updateObjectCost(this);
+    }
 
-	return mLinksetCost;
+    return mLinksetCost;
 }
 
 F32 LLViewerObject::getPhysicsCost()
 {
-	if (mCostStale)
-	{
-		gObjectList.updateObjectCost(this);
-	}
-	
-	return mPhysicsCost;
+    if (mCostStale)
+    {
+        gObjectList.updateObjectCost(this);
+    }
+
+    return mPhysicsCost;
 }
 
 F32 LLViewerObject::getLinksetPhysicsCost()
 {
-	if (mCostStale)
-	{
-		gObjectList.updateObjectCost(this);
-	}
+    if (mCostStale)
+    {
+        gObjectList.updateObjectCost(this);
+    }
 
-	return mLinksetPhysicsCost;
+    return mLinksetPhysicsCost;
 }
 
 F32 LLViewerObject::recursiveGetEstTrianglesMax() const
@@ -3971,7 +3971,7 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
 S32 LLViewerObject::getAnimatedObjectMaxTris() const
 {
     S32 max_tris = 0;
-    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits")) 
+    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
     {
         max_tris = S32_MAX;
     }
@@ -4003,7 +4003,7 @@ F32 LLViewerObject::getEstTrianglesStreamingCost() const
 // virtual
 F32 LLViewerObject::getStreamingCost() const
 {
-	return 0.f;
+    return 0.f;
 }
 
 // virtual
@@ -4015,12 +4015,12 @@ bool LLViewerObject::getCostData(LLMeshCostData& costs) const
 
 U32 LLViewerObject::getTriangleCount(S32* vcount) const
 {
-	return 0;
+    return 0;
 }
 
 U32 LLViewerObject::getHighLODTriangleCount()
 {
-	return 0;
+    return 0;
 }
 
 U32 LLViewerObject::recursiveGetTriangleCount(S32* vcount) const
@@ -4055,7 +4055,7 @@ F32 LLViewerObject::recursiveGetScaledSurfaceArea() const
         {
             if (volume->getVolume())
             {
-				const LLVector3& scale = volume->getScale();
+                const LLVector3& scale = volume->getScale();
                 area += volume->getVolume()->getSurfaceArea() * llmax(llmax(scale.mV[0], scale.mV[1]), scale.mV[2]);
             }
             LLViewerObject::const_child_list_t children = volume->getChildren();
@@ -4078,68 +4078,68 @@ F32 LLViewerObject::recursiveGetScaledSurfaceArea() const
 
 void LLViewerObject::updateSpatialExtents(LLVector4a& newMin, LLVector4a &newMax)
 {
-	LLVector4a center;
-	center.load3(getRenderPosition().mV);
-	LLVector4a size;
-	size.load3(getScale().mV);
-	newMin.setSub(center, size);
-	newMax.setAdd(center, size);
-	
-	mDrawable->setPositionGroup(center);
+    LLVector4a center;
+    center.load3(getRenderPosition().mV);
+    LLVector4a size;
+    size.load3(getScale().mV);
+    newMin.setSub(center, size);
+    newMax.setAdd(center, size);
+
+    mDrawable->setPositionGroup(center);
 }
 
 F32 LLViewerObject::getBinRadius()
 {
-	if (mDrawable.notNull())
-	{
-		const LLVector4a* ext = mDrawable->getSpatialExtents();
-		LLVector4a diff;
-		diff.setSub(ext[1], ext[0]);
-		return diff.getLength3().getF32();
-	}
-	
-	return getScale().magVec();
+    if (mDrawable.notNull())
+    {
+        const LLVector4a* ext = mDrawable->getSpatialExtents();
+        LLVector4a diff;
+        diff.setSub(ext[1], ext[0]);
+        return diff.getLength3().getF32();
+    }
+
+    return getScale().magVec();
 }
 
 F32 LLViewerObject::getMaxScale() const
 {
-	return llmax(getScale().mV[VX],getScale().mV[VY], getScale().mV[VZ]);
+    return llmax(getScale().mV[VX],getScale().mV[VY], getScale().mV[VZ]);
 }
 
 F32 LLViewerObject::getMinScale() const
 {
-	return llmin(getScale().mV[0],getScale().mV[1],getScale().mV[2]);
+    return llmin(getScale().mV[0],getScale().mV[1],getScale().mV[2]);
 }
 
 F32 LLViewerObject::getMidScale() const
 {
-	if (getScale().mV[VX] < getScale().mV[VY])
-	{
-		if (getScale().mV[VY] < getScale().mV[VZ])
-		{
-			return getScale().mV[VY];
-		}
-		else if (getScale().mV[VX] < getScale().mV[VZ])
-		{
-			return getScale().mV[VZ];
-		}
-		else
-		{
-			return getScale().mV[VX];
-		}
-	}
-	else if (getScale().mV[VX] < getScale().mV[VZ])
-	{
-		return getScale().mV[VX];
-	}
-	else if (getScale().mV[VY] < getScale().mV[VZ])
-	{
-		return getScale().mV[VZ];
-	}
-	else
-	{
-		return getScale().mV[VY];
-	}
+    if (getScale().mV[VX] < getScale().mV[VY])
+    {
+        if (getScale().mV[VY] < getScale().mV[VZ])
+        {
+            return getScale().mV[VY];
+        }
+        else if (getScale().mV[VX] < getScale().mV[VZ])
+        {
+            return getScale().mV[VZ];
+        }
+        else
+        {
+            return getScale().mV[VX];
+        }
+    }
+    else if (getScale().mV[VX] < getScale().mV[VZ])
+    {
+        return getScale().mV[VX];
+    }
+    else if (getScale().mV[VY] < getScale().mV[VZ])
+    {
+        return getScale().mV[VZ];
+    }
+    else
+    {
+        return getScale().mV[VY];
+    }
 }
 
 
@@ -4149,68 +4149,68 @@ void LLViewerObject::updateTextures()
 
 void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */)
 {
-	if (isDead() || !getVolume())
-	{
-		return;
-	}
-
-	S32 i;
-	S32 tex_count = getNumTEs();
-	for (i = 0; i < tex_count; i++)
-	{
- 		getTEImage(i)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
-	}
-
-	if (isSculpted() && !isMesh())
-	{
-		LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-		LLUUID sculpt_id = sculpt_params->getSculptTexture();
-		LLViewerTextureManager::getFetchedTexture(sculpt_id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
-	}
-	
-	if (boost_children)
-	{
-		for (child_list_t::iterator iter = mChildList.begin();
-			 iter != mChildList.end(); iter++)
-		{
-			LLViewerObject* child = *iter;
-			child->boostTexturePriority();
-		}
-	}
+    if (isDead() || !getVolume())
+    {
+        return;
+    }
+
+    S32 i;
+    S32 tex_count = getNumTEs();
+    for (i = 0; i < tex_count; i++)
+    {
+        getTEImage(i)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
+    }
+
+    if (isSculpted() && !isMesh())
+    {
+        LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+        LLUUID sculpt_id = sculpt_params->getSculptTexture();
+        LLViewerTextureManager::getFetchedTexture(sculpt_id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
+    }
+
+    if (boost_children)
+    {
+        for (child_list_t::iterator iter = mChildList.begin();
+             iter != mChildList.end(); iter++)
+        {
+            LLViewerObject* child = *iter;
+            child->boostTexturePriority();
+        }
+    }
 }
 
 void LLViewerObject::setLineWidthForWindowSize(S32 window_width)
 {
-	if (window_width < 700)
-	{
-		LLUI::setLineWidth(2.0f);
-	}
-	else if (window_width < 1100)
-	{
-		LLUI::setLineWidth(3.0f);
-	}
-	else if (window_width < 2000)
-	{
-		LLUI::setLineWidth(4.0f);
-	}
-	else
-	{
-		// _damn_, what a nice monitor!
-		LLUI::setLineWidth(5.0f);
-	}
+    if (window_width < 700)
+    {
+        LLUI::setLineWidth(2.0f);
+    }
+    else if (window_width < 1100)
+    {
+        LLUI::setLineWidth(3.0f);
+    }
+    else if (window_width < 2000)
+    {
+        LLUI::setLineWidth(4.0f);
+    }
+    else
+    {
+        // _damn_, what a nice monitor!
+        LLUI::setLineWidth(5.0f);
+    }
 }
 
 void LLViewerObject::increaseArrowLength()
 {
 /* ???
-	if (mAxisArrowLength == 50)
-	{
-		mAxisArrowLength = 100;
-	}
-	else
-	{
-		mAxisArrowLength = 150;
-	}
+    if (mAxisArrowLength == 50)
+    {
+        mAxisArrowLength = 100;
+    }
+    else
+    {
+        mAxisArrowLength = 150;
+    }
 */
 }
 
@@ -4218,193 +4218,193 @@ void LLViewerObject::increaseArrowLength()
 void LLViewerObject::decreaseArrowLength()
 {
 /* ???
-	if (mAxisArrowLength == 150)
-	{
-		mAxisArrowLength = 100;
-	}
-	else
-	{
-		mAxisArrowLength = 50;
-	}
+    if (mAxisArrowLength == 150)
+    {
+        mAxisArrowLength = 100;
+    }
+    else
+    {
+        mAxisArrowLength = 50;
+    }
 */
 }
 
 // Culled from newsim LLTask::addNVPair
 void LLViewerObject::addNVPair(const std::string& data)
 {
-	// cout << "LLViewerObject::addNVPair() with ---" << data << "---" << endl;
-	LLNameValue *nv = new LLNameValue(data.c_str());
-
-//	char splat[MAX_STRING];
-//	temp->printNameValue(splat);
-//	LL_INFOS() << "addNVPair " << splat << LL_ENDL;
-
-	name_value_map_t::iterator iter = mNameValuePairs.find(nv->mName);
-	if (iter != mNameValuePairs.end())
-	{
-		LLNameValue* foundnv = iter->second;
-		if (foundnv->mClass != NVC_READ_ONLY)
-		{
-			delete foundnv;
-			mNameValuePairs.erase(iter);
-		}
-		else
-		{
-			delete nv;
-//			LL_INFOS() << "Trying to write to Read Only NVPair " << temp->mName << " in addNVPair()" << LL_ENDL;
-			return;
-		}
-	}
-	mNameValuePairs[nv->mName] = nv;
+    // cout << "LLViewerObject::addNVPair() with ---" << data << "---" << endl;
+    LLNameValue *nv = new LLNameValue(data.c_str());
+
+//  char splat[MAX_STRING];
+//  temp->printNameValue(splat);
+//  LL_INFOS() << "addNVPair " << splat << LL_ENDL;
+
+    name_value_map_t::iterator iter = mNameValuePairs.find(nv->mName);
+    if (iter != mNameValuePairs.end())
+    {
+        LLNameValue* foundnv = iter->second;
+        if (foundnv->mClass != NVC_READ_ONLY)
+        {
+            delete foundnv;
+            mNameValuePairs.erase(iter);
+        }
+        else
+        {
+            delete nv;
+//          LL_INFOS() << "Trying to write to Read Only NVPair " << temp->mName << " in addNVPair()" << LL_ENDL;
+            return;
+        }
+    }
+    mNameValuePairs[nv->mName] = nv;
 }
 
 BOOL LLViewerObject::removeNVPair(const std::string& name)
 {
-	char* canonical_name = gNVNameTable.addString(name);
+    char* canonical_name = gNVNameTable.addString(name);
 
-	LL_DEBUGS() << "LLViewerObject::removeNVPair(): " << name << LL_ENDL;
+    LL_DEBUGS() << "LLViewerObject::removeNVPair(): " << name << LL_ENDL;
 
-	name_value_map_t::iterator iter = mNameValuePairs.find(canonical_name);
-	if (iter != mNameValuePairs.end())
-	{
-		if( mRegionp )
-		{
-			LLNameValue* nv = iter->second;
+    name_value_map_t::iterator iter = mNameValuePairs.find(canonical_name);
+    if (iter != mNameValuePairs.end())
+    {
+        if( mRegionp )
+        {
+            LLNameValue* nv = iter->second;
 /*
-			std::string buffer = nv->printNameValue();
-			gMessageSystem->newMessageFast(_PREHASH_RemoveNameValuePair);
-			gMessageSystem->nextBlockFast(_PREHASH_TaskData);
-			gMessageSystem->addUUIDFast(_PREHASH_ID, mID);
-			
-			gMessageSystem->nextBlockFast(_PREHASH_NameValueData);
-			gMessageSystem->addStringFast(_PREHASH_NVPair, buffer);
-
-			gMessageSystem->sendReliable( mRegionp->getHost() );
+            std::string buffer = nv->printNameValue();
+            gMessageSystem->newMessageFast(_PREHASH_RemoveNameValuePair);
+            gMessageSystem->nextBlockFast(_PREHASH_TaskData);
+            gMessageSystem->addUUIDFast(_PREHASH_ID, mID);
+
+            gMessageSystem->nextBlockFast(_PREHASH_NameValueData);
+            gMessageSystem->addStringFast(_PREHASH_NVPair, buffer);
+
+            gMessageSystem->sendReliable( mRegionp->getHost() );
 */
-			// Remove the NV pair from the local list.
-			delete nv;
-			mNameValuePairs.erase(iter);
-			return TRUE;
-		}
-		else
-		{
-			LL_DEBUGS() << "removeNVPair - No region for object" << LL_ENDL;
-		}
-	}
-	return FALSE;
+            // Remove the NV pair from the local list.
+            delete nv;
+            mNameValuePairs.erase(iter);
+            return TRUE;
+        }
+        else
+        {
+            LL_DEBUGS() << "removeNVPair - No region for object" << LL_ENDL;
+        }
+    }
+    return FALSE;
 }
 
 
 LLNameValue *LLViewerObject::getNVPair(const std::string& name) const
 {
-	char		*canonical_name;
+    char        *canonical_name;
 
-	canonical_name = gNVNameTable.addString(name);
+    canonical_name = gNVNameTable.addString(name);
 
-	// If you access a map with a name that isn't in it, it will add the name and a null pointer.
-	// So first check if the data is in the map.
-	name_value_map_t::const_iterator iter = mNameValuePairs.find(canonical_name);
-	if (iter != mNameValuePairs.end())
-	{
-		return iter->second;
-	}
-	else
-	{
-		return NULL;
-	}
+    // If you access a map with a name that isn't in it, it will add the name and a null pointer.
+    // So first check if the data is in the map.
+    name_value_map_t::const_iterator iter = mNameValuePairs.find(canonical_name);
+    if (iter != mNameValuePairs.end())
+    {
+        return iter->second;
+    }
+    else
+    {
+        return NULL;
+    }
 }
 
 void LLViewerObject::updatePositionCaches() const
 {
-	// If region is removed from the list it is also deleted.
-	if(mRegionp && LLWorld::instance().isRegionListed(mRegionp))
-	{
-		if (!isRoot())
-		{
-			mPositionRegion = ((LLViewerObject *)getParent())->getPositionRegion() + getPosition() * getParent()->getRotation();
-			mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
-		}
-		else
-		{
-			mPositionRegion = getPosition();
-			mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
-		}
-	}
+    // If region is removed from the list it is also deleted.
+    if(mRegionp && LLWorld::instance().isRegionListed(mRegionp))
+    {
+        if (!isRoot())
+        {
+            mPositionRegion = ((LLViewerObject *)getParent())->getPositionRegion() + getPosition() * getParent()->getRotation();
+            mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+        }
+        else
+        {
+            mPositionRegion = getPosition();
+            mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+        }
+    }
 }
 
 const LLVector3d LLViewerObject::getPositionGlobal() const
-{	
-	// If region is removed from the list it is also deleted.
-	if(mRegionp && LLWorld::instance().isRegionListed(mRegionp))
-	{
-		LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
-
-		if (isAttachment())
-		{
-			position_global = gAgent.getPosGlobalFromAgent(getRenderPosition());
-		}		
-		return position_global;
-	}
-	else
-	{
-		LLVector3d position_global(getPosition());
-		return position_global;
-	}	
+{
+    // If region is removed from the list it is also deleted.
+    if(mRegionp && LLWorld::instance().isRegionListed(mRegionp))
+    {
+        LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
+
+        if (isAttachment())
+        {
+            position_global = gAgent.getPosGlobalFromAgent(getRenderPosition());
+        }
+        return position_global;
+    }
+    else
+    {
+        LLVector3d position_global(getPosition());
+        return position_global;
+    }
 }
 
 const LLVector3 &LLViewerObject::getPositionAgent() const
 {
-	// If region is removed from the list it is also deleted.
-	if(mRegionp && LLWorld::instance().isRegionListed(mRegionp))
-	{
-		if (mDrawable.notNull() && (!mDrawable->isRoot() && getParent()))
-		{
-			// Don't return cached position if you have a parent, recalc (until all dirtying is done correctly.
-			LLVector3 position_region;
-			position_region = ((LLViewerObject *)getParent())->getPositionRegion() + getPosition() * getParent()->getRotation();
-			mPositionAgent = mRegionp->getPosAgentFromRegion(position_region);
-		}
-		else
-		{
-			mPositionAgent = mRegionp->getPosAgentFromRegion(getPosition());
-		}
-	}
-	return mPositionAgent;
+    // If region is removed from the list it is also deleted.
+    if(mRegionp && LLWorld::instance().isRegionListed(mRegionp))
+    {
+        if (mDrawable.notNull() && (!mDrawable->isRoot() && getParent()))
+        {
+            // Don't return cached position if you have a parent, recalc (until all dirtying is done correctly.
+            LLVector3 position_region;
+            position_region = ((LLViewerObject *)getParent())->getPositionRegion() + getPosition() * getParent()->getRotation();
+            mPositionAgent = mRegionp->getPosAgentFromRegion(position_region);
+        }
+        else
+        {
+            mPositionAgent = mRegionp->getPosAgentFromRegion(getPosition());
+        }
+    }
+    return mPositionAgent;
 }
 
 const LLVector3 &LLViewerObject::getPositionRegion() const
 {
-	if (!isRoot())
-	{
-		LLViewerObject *parent = (LLViewerObject *)getParent();
-		mPositionRegion = parent->getPositionRegion() + (getPosition() * parent->getRotation());
-	}
-	else
-	{
-		mPositionRegion = getPosition();
-	}
+    if (!isRoot())
+    {
+        LLViewerObject *parent = (LLViewerObject *)getParent();
+        mPositionRegion = parent->getPositionRegion() + (getPosition() * parent->getRotation());
+    }
+    else
+    {
+        mPositionRegion = getPosition();
+    }
 
-	return mPositionRegion;
+    return mPositionRegion;
 }
 
 const LLVector3 LLViewerObject::getPositionEdit() const
 {
-	if (isRootEdit())
-	{
-		return getPosition();
-	}
-	else
-	{
-		LLViewerObject *parent = (LLViewerObject *)getParent();
-		LLVector3 position_edit = parent->getPositionEdit() + getPosition() * parent->getRotationEdit();
-		return position_edit;
-	}
+    if (isRootEdit())
+    {
+        return getPosition();
+    }
+    else
+    {
+        LLViewerObject *parent = (LLViewerObject *)getParent();
+        LLVector3 position_edit = parent->getPositionEdit() + getPosition() * parent->getRotationEdit();
+        return position_edit;
+    }
 }
 
 const LLVector3 LLViewerObject::getRenderPosition() const
 {
-	if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED))
-	{
+    if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED))
+    {
         LLControlAvatar *cav = getControlAvatar();
         if (isRoot() && cav)
         {
@@ -4417,448 +4417,448 @@ const LLVector3 LLViewerObject::getRenderPosition() const
                 return pos;
             }
         }
-		LLVOAvatar* avatar = getAvatar();
-		if ((avatar) && !getControlAvatar())
-		{
-			return avatar->getPositionAgent();
-		}
-	}
+        LLVOAvatar* avatar = getAvatar();
+        if ((avatar) && !getControlAvatar())
+        {
+            return avatar->getPositionAgent();
+        }
+    }
 
-	if (mDrawable.isNull() || mDrawable->getGeneration() < 0)
-	{
-		return getPositionAgent();
-	}
-	else
-	{
-		return mDrawable->getPositionAgent();
-	}
+    if (mDrawable.isNull() || mDrawable->getGeneration() < 0)
+    {
+        return getPositionAgent();
+    }
+    else
+    {
+        return mDrawable->getPositionAgent();
+    }
 }
 
 const LLVector3 LLViewerObject::getPivotPositionAgent() const
 {
-	return getRenderPosition();
+    return getRenderPosition();
 }
 
 const LLQuaternion LLViewerObject::getRenderRotation() const
 {
-	LLQuaternion ret;
-	if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED) && !isAnimatedObject())
-	{
-		return ret;
-	}
-	
-	if (mDrawable.isNull() || mDrawable->isStatic())
-	{
-		ret = getRotationEdit();
-	}
-	else
-	{
-		if (!mDrawable->isRoot())
-		{
-			ret = getRotation() * LLQuaternion(mDrawable->getParent()->getWorldMatrix());
-		}
-		else
-		{
-			ret = LLQuaternion(mDrawable->getWorldMatrix());
-		}
-	}
-	
-	return ret;
+    LLQuaternion ret;
+    if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED) && !isAnimatedObject())
+    {
+        return ret;
+    }
+
+    if (mDrawable.isNull() || mDrawable->isStatic())
+    {
+        ret = getRotationEdit();
+    }
+    else
+    {
+        if (!mDrawable->isRoot())
+        {
+            ret = getRotation() * LLQuaternion(mDrawable->getParent()->getWorldMatrix());
+        }
+        else
+        {
+            ret = LLQuaternion(mDrawable->getWorldMatrix());
+        }
+    }
+
+    return ret;
 }
 
 const LLMatrix4 LLViewerObject::getRenderMatrix() const
 {
-	return mDrawable->getWorldMatrix();
+    return mDrawable->getWorldMatrix();
 }
 
 const LLQuaternion LLViewerObject::getRotationRegion() const
 {
-	LLQuaternion global_rotation = getRotation();
-	if (!((LLXform *)this)->isRoot())
-	{
-		global_rotation = global_rotation * getParent()->getRotation();
-	}
-	return global_rotation;
+    LLQuaternion global_rotation = getRotation();
+    if (!((LLXform *)this)->isRoot())
+    {
+        global_rotation = global_rotation * getParent()->getRotation();
+    }
+    return global_rotation;
 }
 
 const LLQuaternion LLViewerObject::getRotationEdit() const
 {
-	LLQuaternion global_rotation = getRotation();
-	if (!((LLXform *)this)->isRootEdit())
-	{
-		global_rotation = global_rotation * getParent()->getRotation();
-	}
-	return global_rotation;
+    LLQuaternion global_rotation = getRotation();
+    if (!((LLXform *)this)->isRootEdit())
+    {
+        global_rotation = global_rotation * getParent()->getRotation();
+    }
+    return global_rotation;
 }
 
 void LLViewerObject::setPositionAbsoluteGlobal( const LLVector3d &pos_global, BOOL damped )
 {
-	if (isAttachment())
-	{
-		LLVector3 new_pos = mRegionp->getPosRegionFromGlobal(pos_global);
-		if (isRootEdit())
-		{
-			new_pos -= mDrawable->mXform.getParent()->getWorldPosition();
-			LLQuaternion world_rotation = mDrawable->mXform.getParent()->getWorldRotation();
-			new_pos = new_pos * ~world_rotation;
-		}
-		else
-		{
-			LLViewerObject* parentp = (LLViewerObject*)getParent();
-			new_pos -= parentp->getPositionAgent();
-			new_pos = new_pos * ~parentp->getRotationRegion();
-		}
-		LLViewerObject::setPosition(new_pos);
-		
-		if (mParent && ((LLViewerObject*)mParent)->isAvatar())
-		{
-			// we have changed the position of an attachment, so we need to clamp it
-			LLVOAvatar *avatar = (LLVOAvatar*)mParent;
-
-			avatar->clampAttachmentPositions();
-		}
-	}
-	else
-	{
-		if( isRoot() )
-		{
-			setPositionRegion(mRegionp->getPosRegionFromGlobal(pos_global));
-		}
-		else
-		{
-			// the relative position with the parent is not constant
-			LLViewerObject* parent = (LLViewerObject *)getParent();
-			//RN: this assumes we are only calling this function from the edit tools
-			gPipeline.updateMoveNormalAsync(parent->mDrawable);
-
-			LLVector3 pos_local = mRegionp->getPosRegionFromGlobal(pos_global) - parent->getPositionRegion();
-			pos_local = pos_local * ~parent->getRotationRegion();
-			LLViewerObject::setPosition( pos_local );
-		}
-	}
-	//RN: assumes we always want to snap the object when calling this function
-	gPipeline.updateMoveNormalAsync(mDrawable);
+    if (isAttachment())
+    {
+        LLVector3 new_pos = mRegionp->getPosRegionFromGlobal(pos_global);
+        if (isRootEdit())
+        {
+            new_pos -= mDrawable->mXform.getParent()->getWorldPosition();
+            LLQuaternion world_rotation = mDrawable->mXform.getParent()->getWorldRotation();
+            new_pos = new_pos * ~world_rotation;
+        }
+        else
+        {
+            LLViewerObject* parentp = (LLViewerObject*)getParent();
+            new_pos -= parentp->getPositionAgent();
+            new_pos = new_pos * ~parentp->getRotationRegion();
+        }
+        LLViewerObject::setPosition(new_pos);
+
+        if (mParent && ((LLViewerObject*)mParent)->isAvatar())
+        {
+            // we have changed the position of an attachment, so we need to clamp it
+            LLVOAvatar *avatar = (LLVOAvatar*)mParent;
+
+            avatar->clampAttachmentPositions();
+        }
+    }
+    else
+    {
+        if( isRoot() )
+        {
+            setPositionRegion(mRegionp->getPosRegionFromGlobal(pos_global));
+        }
+        else
+        {
+            // the relative position with the parent is not constant
+            LLViewerObject* parent = (LLViewerObject *)getParent();
+            //RN: this assumes we are only calling this function from the edit tools
+            gPipeline.updateMoveNormalAsync(parent->mDrawable);
+
+            LLVector3 pos_local = mRegionp->getPosRegionFromGlobal(pos_global) - parent->getPositionRegion();
+            pos_local = pos_local * ~parent->getRotationRegion();
+            LLViewerObject::setPosition( pos_local );
+        }
+    }
+    //RN: assumes we always want to snap the object when calling this function
+    gPipeline.updateMoveNormalAsync(mDrawable);
 }
 
 void LLViewerObject::setPosition(const LLVector3 &pos, BOOL damped)
 {
-	if (getPosition() != pos)
-	{
-		setChanged(TRANSLATED | SILHOUETTE);
-	}
-		
-	LLXform::setPosition(pos);
-	updateDrawable(damped);
-	if (isRoot())
-	{
-		// position caches need to be up to date on root objects
-		updatePositionCaches();
-	}
+    if (getPosition() != pos)
+    {
+        setChanged(TRANSLATED | SILHOUETTE);
+    }
+
+    LLXform::setPosition(pos);
+    updateDrawable(damped);
+    if (isRoot())
+    {
+        // position caches need to be up to date on root objects
+        updatePositionCaches();
+    }
 }
 
 void LLViewerObject::setPositionGlobal(const LLVector3d &pos_global, BOOL damped)
 {
-	if (isAttachment())
-	{
-		if (isRootEdit())
-		{
-			LLVector3 newPos = mRegionp->getPosRegionFromGlobal(pos_global);
-			newPos = newPos - mDrawable->mXform.getParent()->getWorldPosition();
-
-			LLQuaternion invWorldRotation = mDrawable->mXform.getParent()->getWorldRotation();
-			invWorldRotation.transQuat();
-
-			newPos = newPos * invWorldRotation;
-			LLViewerObject::setPosition(newPos);
-		}
-		else
-		{
-			// assumes parent is root editable (root of attachment)
-			LLVector3 newPos = mRegionp->getPosRegionFromGlobal(pos_global);
-			newPos = newPos - mDrawable->mXform.getParent()->getWorldPosition();
-			LLVector3 delta_pos = newPos - getPosition();
-
-			LLQuaternion invRotation = mDrawable->getRotation();
-			invRotation.transQuat();
-			
-			delta_pos = delta_pos * invRotation;
-
-			// *FIX: is this right?  Shouldn't we be calling the
-			// LLViewerObject version of setPosition?
-			LLVector3 old_pos = mDrawable->mXform.getParent()->getPosition();
-			mDrawable->mXform.getParent()->setPosition(old_pos + delta_pos);
-			setChanged(TRANSLATED | SILHOUETTE);
-		}
-		if (mParent && ((LLViewerObject*)mParent)->isAvatar())
-		{
-			// we have changed the position of an attachment, so we need to clamp it
-			LLVOAvatar *avatar = (LLVOAvatar*)mParent;
-
-			avatar->clampAttachmentPositions();
-		}
-	}
-	else
-	{
-		if (isRoot())
-		{
-			setPositionRegion(mRegionp->getPosRegionFromGlobal(pos_global));
-		}
-		else
-		{
-			// the relative position with the parent is constant, but the parent's position needs to be changed
-			LLVector3d position_offset;
-			position_offset.setVec(getPosition()*getParent()->getRotation());
-			LLVector3d new_pos_global = pos_global - position_offset;
-			((LLViewerObject *)getParent())->setPositionGlobal(new_pos_global);
-		}
-	}
-	updateDrawable(damped);
+    if (isAttachment())
+    {
+        if (isRootEdit())
+        {
+            LLVector3 newPos = mRegionp->getPosRegionFromGlobal(pos_global);
+            newPos = newPos - mDrawable->mXform.getParent()->getWorldPosition();
+
+            LLQuaternion invWorldRotation = mDrawable->mXform.getParent()->getWorldRotation();
+            invWorldRotation.transQuat();
+
+            newPos = newPos * invWorldRotation;
+            LLViewerObject::setPosition(newPos);
+        }
+        else
+        {
+            // assumes parent is root editable (root of attachment)
+            LLVector3 newPos = mRegionp->getPosRegionFromGlobal(pos_global);
+            newPos = newPos - mDrawable->mXform.getParent()->getWorldPosition();
+            LLVector3 delta_pos = newPos - getPosition();
+
+            LLQuaternion invRotation = mDrawable->getRotation();
+            invRotation.transQuat();
+
+            delta_pos = delta_pos * invRotation;
+
+            // *FIX: is this right?  Shouldn't we be calling the
+            // LLViewerObject version of setPosition?
+            LLVector3 old_pos = mDrawable->mXform.getParent()->getPosition();
+            mDrawable->mXform.getParent()->setPosition(old_pos + delta_pos);
+            setChanged(TRANSLATED | SILHOUETTE);
+        }
+        if (mParent && ((LLViewerObject*)mParent)->isAvatar())
+        {
+            // we have changed the position of an attachment, so we need to clamp it
+            LLVOAvatar *avatar = (LLVOAvatar*)mParent;
+
+            avatar->clampAttachmentPositions();
+        }
+    }
+    else
+    {
+        if (isRoot())
+        {
+            setPositionRegion(mRegionp->getPosRegionFromGlobal(pos_global));
+        }
+        else
+        {
+            // the relative position with the parent is constant, but the parent's position needs to be changed
+            LLVector3d position_offset;
+            position_offset.setVec(getPosition()*getParent()->getRotation());
+            LLVector3d new_pos_global = pos_global - position_offset;
+            ((LLViewerObject *)getParent())->setPositionGlobal(new_pos_global);
+        }
+    }
+    updateDrawable(damped);
 }
 
 
 void LLViewerObject::setPositionParent(const LLVector3 &pos_parent, BOOL damped)
 {
-	// Set position relative to parent, if no parent, relative to region
-	if (!isRoot())
-	{
-		LLViewerObject::setPosition(pos_parent, damped);
-		//updateDrawable(damped);
-	}
-	else
-	{
-		setPositionRegion(pos_parent, damped);
-	}
+    // Set position relative to parent, if no parent, relative to region
+    if (!isRoot())
+    {
+        LLViewerObject::setPosition(pos_parent, damped);
+        //updateDrawable(damped);
+    }
+    else
+    {
+        setPositionRegion(pos_parent, damped);
+    }
 }
 
 void LLViewerObject::setPositionRegion(const LLVector3 &pos_region, BOOL damped)
 {
-	if (!isRootEdit())
-	{
-		LLViewerObject* parent = (LLViewerObject*) getParent();
-		LLViewerObject::setPosition((pos_region-parent->getPositionRegion())*~parent->getRotationRegion());
-	}
-	else
-	{
-		LLViewerObject::setPosition(pos_region);
-		mPositionRegion = pos_region;
-		mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
-	}
+    if (!isRootEdit())
+    {
+        LLViewerObject* parent = (LLViewerObject*) getParent();
+        LLViewerObject::setPosition((pos_region-parent->getPositionRegion())*~parent->getRotationRegion());
+    }
+    else
+    {
+        LLViewerObject::setPosition(pos_region);
+        mPositionRegion = pos_region;
+        mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+    }
 }
 
 void LLViewerObject::setPositionAgent(const LLVector3 &pos_agent, BOOL damped)
 {
-	LLVector3 pos_region = getRegion()->getPosRegionFromAgent(pos_agent);
-	setPositionRegion(pos_region, damped);
+    LLVector3 pos_region = getRegion()->getPosRegionFromAgent(pos_agent);
+    setPositionRegion(pos_region, damped);
 }
 
-// identical to setPositionRegion() except it checks for child-joints 
+// identical to setPositionRegion() except it checks for child-joints
 // and doesn't also move the joint-parent
 // TODO -- implement similar intelligence for joint-parents toward
 // their joint-children
 void LLViewerObject::setPositionEdit(const LLVector3 &pos_edit, BOOL damped)
 {
-	if (!isRootEdit())
-	{
-		// the relative position with the parent is constant, but the parent's position needs to be changed
-		LLVector3 position_offset = getPosition() * getParent()->getRotation();
+    if (!isRootEdit())
+    {
+        // the relative position with the parent is constant, but the parent's position needs to be changed
+        LLVector3 position_offset = getPosition() * getParent()->getRotation();
 
-		((LLViewerObject *)getParent())->setPositionEdit(pos_edit - position_offset);
-		updateDrawable(damped);
-	}
-	else
-	{
-		LLViewerObject::setPosition(pos_edit, damped);
-		mPositionRegion = pos_edit;
-		mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
-	}	
+        ((LLViewerObject *)getParent())->setPositionEdit(pos_edit - position_offset);
+        updateDrawable(damped);
+    }
+    else
+    {
+        LLViewerObject::setPosition(pos_edit, damped);
+        mPositionRegion = pos_edit;
+        mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+    }
 }
 
 
 LLViewerObject* LLViewerObject::getRootEdit() const
 {
-	const LLViewerObject* root = this;
-	while (root->mParent 
-		   && !((LLViewerObject*)root->mParent)->isAvatar()) 
-	{
-		root = (LLViewerObject*)root->mParent;
-	}
-	return (LLViewerObject*)root;
+    const LLViewerObject* root = this;
+    while (root->mParent
+           && !((LLViewerObject*)root->mParent)->isAvatar())
+    {
+        root = (LLViewerObject*)root->mParent;
+    }
+    return (LLViewerObject*)root;
 }
 
 
 BOOL LLViewerObject::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end,
-										  S32 face,
-										  BOOL pick_transparent,
-										  BOOL pick_rigged,
+                                          S32 face,
+                                          BOOL pick_transparent,
+                                          BOOL pick_rigged,
                                           BOOL pick_unselectable,
-										  S32* face_hit,
-										  LLVector4a* intersection,
-										  LLVector2* tex_coord,
-										  LLVector4a* normal,
-										  LLVector4a* tangent)
+                                          S32* face_hit,
+                                          LLVector4a* intersection,
+                                          LLVector2* tex_coord,
+                                          LLVector4a* normal,
+                                          LLVector4a* tangent)
 {
-	return false;
+    return false;
 }
 
 BOOL LLViewerObject::lineSegmentBoundingBox(const LLVector4a& start, const LLVector4a& end)
 {
-	if (mDrawable.isNull() || mDrawable->isDead())
-	{
-		return FALSE;
-	}
+    if (mDrawable.isNull() || mDrawable->isDead())
+    {
+        return FALSE;
+    }
 
-	const LLVector4a* ext = mDrawable->getSpatialExtents();
+    const LLVector4a* ext = mDrawable->getSpatialExtents();
 
-	//VECTORIZE THIS
-	LLVector4a center;
-	center.setAdd(ext[1], ext[0]);
-	center.mul(0.5f);
-	LLVector4a size;
-	size.setSub(ext[1], ext[0]);
-	size.mul(0.5f);
+    //VECTORIZE THIS
+    LLVector4a center;
+    center.setAdd(ext[1], ext[0]);
+    center.mul(0.5f);
+    LLVector4a size;
+    size.setSub(ext[1], ext[0]);
+    size.mul(0.5f);
 
-	return LLLineSegmentBoxIntersect(start, end, center, size);
+    return LLLineSegmentBoxIntersect(start, end, center, size);
 }
 
 U8 LLViewerObject::getMediaType() const
 {
-	if (mMedia)
-	{
-		return mMedia->mMediaType;
-	}
-	else
-	{
-		return LLViewerObject::MEDIA_NONE;
-	}
+    if (mMedia)
+    {
+        return mMedia->mMediaType;
+    }
+    else
+    {
+        return LLViewerObject::MEDIA_NONE;
+    }
 }
 
 void LLViewerObject::setMediaType(U8 media_type)
 {
-	if (!mMedia)
-	{
-		// TODO what if we don't have a media pointer?
-	}
-	else if (mMedia->mMediaType != media_type)
-	{
-		mMedia->mMediaType = media_type;
+    if (!mMedia)
+    {
+        // TODO what if we don't have a media pointer?
+    }
+    else if (mMedia->mMediaType != media_type)
+    {
+        mMedia->mMediaType = media_type;
 
-		// TODO: update materials with new image
-	}
+        // TODO: update materials with new image
+    }
 }
 
 std::string LLViewerObject::getMediaURL() const
 {
-	if (mMedia)
-	{
-		return mMedia->mMediaURL;
-	}
-	else
-	{
-		return std::string();
-	}
+    if (mMedia)
+    {
+        return mMedia->mMediaURL;
+    }
+    else
+    {
+        return std::string();
+    }
 }
 
 void LLViewerObject::setMediaURL(const std::string& media_url)
 {
-	if (!mMedia)
-	{
-		mMedia = new LLViewerObjectMedia;
-		mMedia->mMediaURL = media_url;
-		mMedia->mPassedWhitelist = FALSE;
+    if (!mMedia)
+    {
+        mMedia = new LLViewerObjectMedia;
+        mMedia->mMediaURL = media_url;
+        mMedia->mPassedWhitelist = FALSE;
 
-		// TODO: update materials with new image
-	}
-	else if (mMedia->mMediaURL != media_url)
-	{
-		mMedia->mMediaURL = media_url;
-		mMedia->mPassedWhitelist = FALSE;
+        // TODO: update materials with new image
+    }
+    else if (mMedia->mMediaURL != media_url)
+    {
+        mMedia->mMediaURL = media_url;
+        mMedia->mPassedWhitelist = FALSE;
 
-		// TODO: update materials with new image
-	}
+        // TODO: update materials with new image
+    }
 }
 
 BOOL LLViewerObject::getMediaPassedWhitelist() const
 {
-	if (mMedia)
-	{
-		return mMedia->mPassedWhitelist;
-	}
-	else
-	{
-		return FALSE;
-	}
+    if (mMedia)
+    {
+        return mMedia->mPassedWhitelist;
+    }
+    else
+    {
+        return FALSE;
+    }
 }
 
 void LLViewerObject::setMediaPassedWhitelist(BOOL passed)
 {
-	if (mMedia)
-	{
-		mMedia->mPassedWhitelist = passed;
-	}
+    if (mMedia)
+    {
+        mMedia->mPassedWhitelist = passed;
+    }
 }
 
 BOOL LLViewerObject::setMaterial(const U8 material)
 {
-	BOOL res = LLPrimitive::setMaterial(material);
-	if (res)
-	{
-		setChanged(TEXTURE);
-	}
-	return res;
+    BOOL res = LLPrimitive::setMaterial(material);
+    if (res)
+    {
+        setChanged(TEXTURE);
+    }
+    return res;
 }
 
 void LLViewerObject::setNumTEs(const U8 num_tes)
 {
-	U32 i;
-	if (num_tes != getNumTEs())
-	{
-		if (num_tes)
-		{
-			LLPointer<LLViewerTexture> *new_images;
-			new_images = new LLPointer<LLViewerTexture>[num_tes];
-			
-			LLPointer<LLViewerTexture> *new_normmaps;
-			new_normmaps = new LLPointer<LLViewerTexture>[num_tes];
-			
-			LLPointer<LLViewerTexture> *new_specmaps;
-			new_specmaps = new LLPointer<LLViewerTexture>[num_tes];
-			for (i = 0; i < num_tes; i++)
-			{
-				if (i < getNumTEs())
-				{
-					new_images[i] = mTEImages[i];
-					new_normmaps[i] = mTENormalMaps[i];
-					new_specmaps[i] = mTESpecularMaps[i];
-				}
-				else if (getNumTEs())
-				{
-					new_images[i] = mTEImages[getNumTEs()-1];
-					new_normmaps[i] = mTENormalMaps[getNumTEs()-1];
-					new_specmaps[i] = mTESpecularMaps[getNumTEs()-1];
-				}
-				else
-				{
-					new_images[i] = NULL;
-					new_normmaps[i] = NULL;
-					new_specmaps[i] = NULL;
-				}
-			}
-
-			deleteTEImages();
-			
-			mTEImages = new_images;
-			mTENormalMaps = new_normmaps;
-			mTESpecularMaps = new_specmaps;
-		}
-		else
-		{
-			deleteTEImages();
-		}
+    U32 i;
+    if (num_tes != getNumTEs())
+    {
+        if (num_tes)
+        {
+            LLPointer<LLViewerTexture> *new_images;
+            new_images = new LLPointer<LLViewerTexture>[num_tes];
+
+            LLPointer<LLViewerTexture> *new_normmaps;
+            new_normmaps = new LLPointer<LLViewerTexture>[num_tes];
+
+            LLPointer<LLViewerTexture> *new_specmaps;
+            new_specmaps = new LLPointer<LLViewerTexture>[num_tes];
+            for (i = 0; i < num_tes; i++)
+            {
+                if (i < getNumTEs())
+                {
+                    new_images[i] = mTEImages[i];
+                    new_normmaps[i] = mTENormalMaps[i];
+                    new_specmaps[i] = mTESpecularMaps[i];
+                }
+                else if (getNumTEs())
+                {
+                    new_images[i] = mTEImages[getNumTEs()-1];
+                    new_normmaps[i] = mTENormalMaps[getNumTEs()-1];
+                    new_specmaps[i] = mTESpecularMaps[getNumTEs()-1];
+                }
+                else
+                {
+                    new_images[i] = NULL;
+                    new_normmaps[i] = NULL;
+                    new_specmaps[i] = NULL;
+                }
+            }
+
+            deleteTEImages();
+
+            mTEImages = new_images;
+            mTENormalMaps = new_normmaps;
+            mTESpecularMaps = new_specmaps;
+        }
+        else
+        {
+            deleteTEImages();
+        }
 
         S32 original_tes = getNumTEs();
 
-		LLPrimitive::setNumTEs(num_tes);
-		setChanged(TEXTURE);
+        LLPrimitive::setNumTEs(num_tes);
+        setChanged(TEXTURE);
 
         // touch up GLTF materials
         if (original_tes > 0)
@@ -4886,124 +4886,124 @@ void LLViewerObject::setNumTEs(const U8 num_tes)
             }
         }
 
-		if (mDrawable.notNull())
-		{
-			gPipeline.markTextured(mDrawable);
-		}
-	}
+        if (mDrawable.notNull())
+        {
+            gPipeline.markTextured(mDrawable);
+        }
+    }
 }
 
 void LLViewerObject::sendMaterialUpdate() const
 {
-	LLViewerRegion* regionp = getRegion();
-	if(!regionp) return;
-	gMessageSystem->newMessageFast(_PREHASH_ObjectMaterial);
-	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID,	mLocalID );
-	gMessageSystem->addU8Fast(_PREHASH_Material, getMaterial() );
-	gMessageSystem->sendReliable( regionp->getHost() );
+    LLViewerRegion* regionp = getRegion();
+    if(!regionp) return;
+    gMessageSystem->newMessageFast(_PREHASH_ObjectMaterial);
+    gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+    gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+    gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+    gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID,  mLocalID );
+    gMessageSystem->addU8Fast(_PREHASH_Material, getMaterial() );
+    gMessageSystem->sendReliable( regionp->getHost() );
 
 }
 
 //formerly send_object_shape(LLViewerObject *object)
 void LLViewerObject::sendShapeUpdate()
 {
-	gMessageSystem->newMessageFast(_PREHASH_ObjectShape);
-	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
+    gMessageSystem->newMessageFast(_PREHASH_ObjectShape);
+    gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+    gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+    gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+    gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
 
-	LLVolumeMessage::packVolumeParams(&getVolume()->getParams(), gMessageSystem);
+    LLVolumeMessage::packVolumeParams(&getVolume()->getParams(), gMessageSystem);
 
-	LLViewerRegion *regionp = getRegion();
-	gMessageSystem->sendReliable( regionp->getHost() );
+    LLViewerRegion *regionp = getRegion();
+    gMessageSystem->sendReliable( regionp->getHost() );
 }
 
 
 void LLViewerObject::sendTEUpdate() const
 {
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_ObjectImage);
+    LLMessageSystem* msg = gMessageSystem;
+    msg->newMessageFast(_PREHASH_ObjectImage);
 
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    msg->nextBlockFast(_PREHASH_AgentData);
+    msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+    msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 
-	msg->nextBlockFast(_PREHASH_ObjectData);
-	msg->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
-	if (mMedia)
-	{
-		msg->addString("MediaURL", mMedia->mMediaURL);
-	}
-	else
-	{
-		msg->addString("MediaURL", NULL);
-	}
+    msg->nextBlockFast(_PREHASH_ObjectData);
+    msg->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
+    if (mMedia)
+    {
+        msg->addString("MediaURL", mMedia->mMediaURL);
+    }
+    else
+    {
+        msg->addString("MediaURL", NULL);
+    }
 
-	// TODO send media type
+    // TODO send media type
 
-	packTEMessage(msg);
+    packTEMessage(msg);
 
-	LLViewerRegion *regionp = getRegion();
-	msg->sendReliable( regionp->getHost() );
+    LLViewerRegion *regionp = getRegion();
+    msg->sendReliable( regionp->getHost() );
 }
 
 LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
 {
-	if (!LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(id))
-	{
-		return NULL;
-	}
-
-	LLViewerObject *root = getRootEdit();
-	if (root && root->isAnimatedObject())
-	{
-		return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-	}
-
-	LLVOAvatar* avatar = getAvatar();
-	if (avatar && !isHUDAttachment())
-	{
-		LLAvatarAppearanceDefines::EBakedTextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id);
-		LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex);
-		if (bakedTexture == NULL || bakedTexture->isMissingAsset())
-		{
-			return LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-		}
-		else
-		{
-			return bakedTexture;
-		}
-	}
-	else
-	{
-		return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-	}
+    if (!LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(id))
+    {
+        return NULL;
+    }
+
+    LLViewerObject *root = getRootEdit();
+    if (root && root->isAnimatedObject())
+    {
+        return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+    }
+
+    LLVOAvatar* avatar = getAvatar();
+    if (avatar && !isHUDAttachment())
+    {
+        LLAvatarAppearanceDefines::EBakedTextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id);
+        LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex);
+        if (bakedTexture == NULL || bakedTexture->isMissingAsset())
+        {
+            return LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+        }
+        else
+        {
+            return bakedTexture;
+        }
+    }
+    else
+    {
+        return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+    }
 
 }
 
 void LLViewerObject::updateAvatarMeshVisibility(const LLUUID& id, const LLUUID& old_id)
 {
-	if (id == old_id)
-	{
-		return;
-	}
+    if (id == old_id)
+    {
+        return;
+    }
 
-	if (!LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(old_id) && !LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(id))
-	{
-		return;
-	}
+    if (!LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(old_id) && !LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(id))
+    {
+        return;
+    }
 
-	LLVOAvatar* avatar = getAvatar();
-	if (avatar)
-	{
-		avatar->updateMeshVisibility();
-	}
+    LLVOAvatar* avatar = getAvatar();
+    if (avatar)
+    {
+        avatar->updateMeshVisibility();
+    }
 }
 
 
@@ -5028,14 +5028,14 @@ void LLViewerObject::setTE(const U8 te, const LLTextureEntry& texture_entry)
 
 void LLViewerObject::updateTEMaterialTextures(U8 te)
 {
-	if (getTE(te)->getMaterialParams().notNull())
-	{
-		const LLUUID& norm_id = getTE(te)->getMaterialParams()->getNormalID();
-		mTENormalMaps[te] = LLViewerTextureManager::getFetchedTexture(norm_id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-		
-		const LLUUID& spec_id = getTE(te)->getMaterialParams()->getSpecularID();
-		mTESpecularMaps[te] = LLViewerTextureManager::getFetchedTexture(spec_id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
-	}
+    if (getTE(te)->getMaterialParams().notNull())
+    {
+        const LLUUID& norm_id = getTE(te)->getMaterialParams()->getNormalID();
+        mTENormalMaps[te] = LLViewerTextureManager::getFetchedTexture(norm_id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+
+        const LLUUID& spec_id = getTE(te)->getMaterialParams()->getSpecularID();
+        mTESpecularMaps[te] = LLViewerTextureManager::getFetchedTexture(spec_id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
+    }
 
     LLFetchedGLTFMaterial* mat = (LLFetchedGLTFMaterial*) getTE(te)->getGLTFRenderMaterial();
     llassert(mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(getTE(te)->getGLTFRenderMaterial()) != nullptr);
@@ -5095,355 +5095,355 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
 
 void LLViewerObject::refreshBakeTexture()
 {
-	for (int face_index = 0; face_index < getNumTEs(); face_index++)
-	{
-		LLTextureEntry* tex_entry = getTE(face_index);
-		if (tex_entry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(tex_entry->getID()))
-		{
-			const LLUUID& image_id = tex_entry->getID();
-			LLViewerTexture* bakedTexture = getBakedTextureForMagicId(image_id);
-			changeTEImage(face_index, bakedTexture);
-		}
-	}
+    for (int face_index = 0; face_index < getNumTEs(); face_index++)
+    {
+        LLTextureEntry* tex_entry = getTE(face_index);
+        if (tex_entry && LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(tex_entry->getID()))
+        {
+            const LLUUID& image_id = tex_entry->getID();
+            LLViewerTexture* bakedTexture = getBakedTextureForMagicId(image_id);
+            changeTEImage(face_index, bakedTexture);
+        }
+    }
 }
 
 void LLViewerObject::setTEImage(const U8 te, LLViewerTexture *imagep)
 {
-	if (mTEImages[te] != imagep)
-	{
-		LLUUID old_image_id = getTE(te) ? getTE(te)->getID() : LLUUID::null;
-		
-		LLPrimitive::setTETexture(te, imagep->getID());
+    if (mTEImages[te] != imagep)
+    {
+        LLUUID old_image_id = getTE(te) ? getTE(te)->getID() : LLUUID::null;
+
+        LLPrimitive::setTETexture(te, imagep->getID());
 
-		LLViewerTexture* baked_texture = getBakedTextureForMagicId(imagep->getID());
-		mTEImages[te] = baked_texture ? baked_texture : imagep;
-		updateAvatarMeshVisibility(imagep->getID(), old_image_id);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull())
-		{
-			gPipeline.markTextured(mDrawable);
-		}
-	}
+        LLViewerTexture* baked_texture = getBakedTextureForMagicId(imagep->getID());
+        mTEImages[te] = baked_texture ? baked_texture : imagep;
+        updateAvatarMeshVisibility(imagep->getID(), old_image_id);
+        setChanged(TEXTURE);
+        if (mDrawable.notNull())
+        {
+            gPipeline.markTextured(mDrawable);
+        }
+    }
 }
 
 S32 LLViewerObject::setTETextureCore(const U8 te, LLViewerTexture *image)
 {
-	LLUUID old_image_id = getTE(te)->getID();
-	const LLUUID& uuid = image ? image->getID() : LLUUID::null;
-	S32 retval = 0;
-	if (uuid != getTE(te)->getID() ||
-		uuid == LLUUID::null)
-	{
-		retval = LLPrimitive::setTETexture(te, uuid);
-		LLViewerTexture* baked_texture = getBakedTextureForMagicId(uuid);
-		mTEImages[te] = baked_texture ? baked_texture : image;
-		updateAvatarMeshVisibility(uuid,old_image_id);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull())
-		{
-			gPipeline.markTextured(mDrawable);
-		}
-	}
-	return retval;
+    LLUUID old_image_id = getTE(te)->getID();
+    const LLUUID& uuid = image ? image->getID() : LLUUID::null;
+    S32 retval = 0;
+    if (uuid != getTE(te)->getID() ||
+        uuid == LLUUID::null)
+    {
+        retval = LLPrimitive::setTETexture(te, uuid);
+        LLViewerTexture* baked_texture = getBakedTextureForMagicId(uuid);
+        mTEImages[te] = baked_texture ? baked_texture : image;
+        updateAvatarMeshVisibility(uuid,old_image_id);
+        setChanged(TEXTURE);
+        if (mDrawable.notNull())
+        {
+            gPipeline.markTextured(mDrawable);
+        }
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTENormalMapCore(const U8 te, LLViewerTexture *image)
 {
-	S32 retval = TEM_CHANGE_TEXTURE;
-	const LLUUID& uuid = image ? image->getID() : LLUUID::null;
-	if (uuid != getTE(te)->getID() ||
-		uuid == LLUUID::null)
-	{
-		LLTextureEntry* tep = getTE(te);
-		LLMaterial* mat = NULL;
-		if (tep)
-		{
-		   mat = tep->getMaterialParams();
-		}
-
-		if (mat)
-		{
-			mat->setNormalID(uuid);
-		}
-	}
-	changeTENormalMap(te,image);	
-	return retval;
+    S32 retval = TEM_CHANGE_TEXTURE;
+    const LLUUID& uuid = image ? image->getID() : LLUUID::null;
+    if (uuid != getTE(te)->getID() ||
+        uuid == LLUUID::null)
+    {
+        LLTextureEntry* tep = getTE(te);
+        LLMaterial* mat = NULL;
+        if (tep)
+        {
+           mat = tep->getMaterialParams();
+        }
+
+        if (mat)
+        {
+            mat->setNormalID(uuid);
+        }
+    }
+    changeTENormalMap(te,image);
+    return retval;
 }
 
 S32 LLViewerObject::setTESpecularMapCore(const U8 te, LLViewerTexture *image)
 {
-	S32 retval = TEM_CHANGE_TEXTURE;
-	const LLUUID& uuid = image ? image->getID() : LLUUID::null;
-	if (uuid != getTE(te)->getID() ||
-		uuid == LLUUID::null)
-	{
-		LLTextureEntry* tep = getTE(te);
-		LLMaterial* mat = NULL;
-		if (tep)
-		{
-			mat = tep->getMaterialParams();
-		}
-
-		if (mat)
-		{
-			mat->setSpecularID(uuid);
-		}		
-	}
-	changeTESpecularMap(te, image);
-	return retval;
+    S32 retval = TEM_CHANGE_TEXTURE;
+    const LLUUID& uuid = image ? image->getID() : LLUUID::null;
+    if (uuid != getTE(te)->getID() ||
+        uuid == LLUUID::null)
+    {
+        LLTextureEntry* tep = getTE(te);
+        LLMaterial* mat = NULL;
+        if (tep)
+        {
+            mat = tep->getMaterialParams();
+        }
+
+        if (mat)
+        {
+            mat->setSpecularID(uuid);
+        }
+    }
+    changeTESpecularMap(te, image);
+    return retval;
 }
 
 //virtual
-void LLViewerObject::changeTEImage(S32 index, LLViewerTexture* new_image) 
+void LLViewerObject::changeTEImage(S32 index, LLViewerTexture* new_image)
 {
-	if(index < 0 || index >= getNumTEs())
-	{
-		return ;
-	}
-	mTEImages[index] = new_image ;
+    if(index < 0 || index >= getNumTEs())
+    {
+        return ;
+    }
+    mTEImages[index] = new_image ;
 }
 
 void LLViewerObject::changeTENormalMap(S32 index, LLViewerTexture* new_image)
 {
-	if(index < 0 || index >= getNumTEs())
-	{
-		return ;
-	}
-	mTENormalMaps[index] = new_image ;
-	refreshMaterials();
+    if(index < 0 || index >= getNumTEs())
+    {
+        return ;
+    }
+    mTENormalMaps[index] = new_image ;
+    refreshMaterials();
 }
 
 void LLViewerObject::changeTESpecularMap(S32 index, LLViewerTexture* new_image)
 {
-	if(index < 0 || index >= getNumTEs())
-	{
-		return ;
-	}
-	mTESpecularMaps[index] = new_image ;
-	refreshMaterials();
+    if(index < 0 || index >= getNumTEs())
+    {
+        return ;
+    }
+    mTESpecularMaps[index] = new_image ;
+    refreshMaterials();
 }
 
 S32 LLViewerObject::setTETexture(const U8 te, const LLUUID& uuid)
 {
-	// Invalid host == get from the agent's sim
-	LLViewerFetchedTexture *image = LLViewerTextureManager::getFetchedTexture(
-		uuid, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, LLHost());
-		return setTETextureCore(te, image);
+    // Invalid host == get from the agent's sim
+    LLViewerFetchedTexture *image = LLViewerTextureManager::getFetchedTexture(
+        uuid, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, LLHost());
+        return setTETextureCore(te, image);
 }
 
 S32 LLViewerObject::setTENormalMap(const U8 te, const LLUUID& uuid)
 {
-	LLViewerFetchedTexture *image = (uuid == LLUUID::null) ? NULL : LLViewerTextureManager::getFetchedTexture(
-		uuid, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, LLHost());
-	return setTENormalMapCore(te, image);
+    LLViewerFetchedTexture *image = (uuid == LLUUID::null) ? NULL : LLViewerTextureManager::getFetchedTexture(
+        uuid, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, LLHost());
+    return setTENormalMapCore(te, image);
 }
 
 S32 LLViewerObject::setTESpecularMap(const U8 te, const LLUUID& uuid)
 {
-	LLViewerFetchedTexture *image = (uuid == LLUUID::null) ? NULL : LLViewerTextureManager::getFetchedTexture(
-		uuid, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, LLHost());
-	return setTESpecularMapCore(te, image);
+    LLViewerFetchedTexture *image = (uuid == LLUUID::null) ? NULL : LLViewerTextureManager::getFetchedTexture(
+        uuid, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, LLHost());
+    return setTESpecularMapCore(te, image);
 }
 
 S32 LLViewerObject::setTEColor(const U8 te, const LLColor3& color)
 {
-	return setTEColor(te, LLColor4(color));
+    return setTEColor(te, LLColor4(color));
 }
 
 S32 LLViewerObject::setTEColor(const U8 te, const LLColor4& color)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (color != tep->getColor())
-	{
-		retval = LLPrimitive::setTEColor(te, color);
-		if (mDrawable.notNull() && retval)
-		{
-			// These should only happen on updates which are not the initial update.
-			dirtyMesh();
-		}
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (color != tep->getColor())
+    {
+        retval = LLPrimitive::setTEColor(te, color);
+        if (mDrawable.notNull() && retval)
+        {
+            // These should only happen on updates which are not the initial update.
+            dirtyMesh();
+        }
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEBumpmap(const U8 te, const U8 bump)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (bump != tep->getBumpmap())
-	{
-		retval = LLPrimitive::setTEBumpmap(te, bump);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull() && retval)
-		{
-			gPipeline.markTextured(mDrawable);
-			gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY);
-		}
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (bump != tep->getBumpmap())
+    {
+        retval = LLPrimitive::setTEBumpmap(te, bump);
+        setChanged(TEXTURE);
+        if (mDrawable.notNull() && retval)
+        {
+            gPipeline.markTextured(mDrawable);
+            gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY);
+        }
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTETexGen(const U8 te, const U8 texgen)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (texgen != tep->getTexGen())
-	{
-		retval = LLPrimitive::setTETexGen(te, texgen);
-		setChanged(TEXTURE);
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (texgen != tep->getTexGen())
+    {
+        retval = LLPrimitive::setTETexGen(te, texgen);
+        setChanged(TEXTURE);
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEMediaTexGen(const U8 te, const U8 media)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (media != tep->getMediaTexGen())
-	{
-		retval = LLPrimitive::setTEMediaTexGen(te, media);
-		setChanged(TEXTURE);
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (media != tep->getMediaTexGen())
+    {
+        retval = LLPrimitive::setTEMediaTexGen(te, media);
+        setChanged(TEXTURE);
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEShiny(const U8 te, const U8 shiny)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (shiny != tep->getShiny())
-	{
-		retval = LLPrimitive::setTEShiny(te, shiny);
-		setChanged(TEXTURE);
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (shiny != tep->getShiny())
+    {
+        retval = LLPrimitive::setTEShiny(te, shiny);
+        setChanged(TEXTURE);
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEFullbright(const U8 te, const U8 fullbright)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (fullbright != tep->getFullbright())
-	{
-		retval = LLPrimitive::setTEFullbright(te, fullbright);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull() && retval)
-		{
-			gPipeline.markTextured(mDrawable);
-		}
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (fullbright != tep->getFullbright())
+    {
+        retval = LLPrimitive::setTEFullbright(te, fullbright);
+        setChanged(TEXTURE);
+        if (mDrawable.notNull() && retval)
+        {
+            gPipeline.markTextured(mDrawable);
+        }
+    }
+    return retval;
 }
 
 
 S32 LLViewerObject::setTEMediaFlags(const U8 te, const U8 media_flags)
 {
-	// this might need work for media type
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (media_flags != tep->getMediaFlags())
-	{
-		retval = LLPrimitive::setTEMediaFlags(te, media_flags);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull() && retval)
-		{
-			gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-			gPipeline.markTextured(mDrawable);
-		}
-	}
-	return retval;
+    // this might need work for media type
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (media_flags != tep->getMediaFlags())
+    {
+        retval = LLPrimitive::setTEMediaFlags(te, media_flags);
+        setChanged(TEXTURE);
+        if (mDrawable.notNull() && retval)
+        {
+            gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+            gPipeline.markTextured(mDrawable);
+        }
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEGlow(const U8 te, const F32 glow)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-	}
-	else if (glow != tep->getGlow())
-	{
-		retval = LLPrimitive::setTEGlow(te, glow);
-		setChanged(TEXTURE);
-		if (mDrawable.notNull() && retval)
-		{
-			gPipeline.markTextured(mDrawable);
-		}
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+    }
+    else if (glow != tep->getGlow())
+    {
+        retval = LLPrimitive::setTEGlow(te, glow);
+        setChanged(TEXTURE);
+        if (mDrawable.notNull() && retval)
+        {
+            gPipeline.markTextured(mDrawable);
+        }
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS("Material") << "No texture entry for te " << (S32)te
-							 << ", object " << mID
-							 << ", material " << pMaterialID
-							 << LL_ENDL;
-	}
-	//else if (pMaterialID != tep->getMaterialID())
-	{
-		LL_DEBUGS("Material") << "Changing texture entry for te " << (S32)te
-							 << ", object " << mID
-							 << ", material " << pMaterialID
-							 << LL_ENDL;
-		retval = LLPrimitive::setTEMaterialID(te, pMaterialID);
-		refreshMaterials();
-	}
-	return retval;
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS("Material") << "No texture entry for te " << (S32)te
+                             << ", object " << mID
+                             << ", material " << pMaterialID
+                             << LL_ENDL;
+    }
+    //else if (pMaterialID != tep->getMaterialID())
+    {
+        LL_DEBUGS("Material") << "Changing texture entry for te " << (S32)te
+                             << ", object " << mID
+                             << ", material " << pMaterialID
+                             << LL_ENDL;
+        retval = LLPrimitive::setTEMaterialID(te, pMaterialID);
+        refreshMaterials();
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams)
 {
-	S32 retval = 0;
-	const LLTextureEntry *tep = getTE(te);
-	if (!tep)
-	{
-		LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
-		return 0;
-	}
+    S32 retval = 0;
+    const LLTextureEntry *tep = getTE(te);
+    if (!tep)
+    {
+        LL_WARNS() << "No texture entry for te " << (S32)te << ", object " << mID << LL_ENDL;
+        return 0;
+    }
 
-	retval = LLPrimitive::setTEMaterialParams(te, pMaterialParams);
-	LL_DEBUGS("Material") << "Changing material params for te " << (S32)te
-							<< ", object " << mID
-			               << " (" << retval << ")"
-							<< LL_ENDL;
-	setTENormalMap(te, (pMaterialParams) ? pMaterialParams->getNormalID() : LLUUID::null);
-	setTESpecularMap(te, (pMaterialParams) ? pMaterialParams->getSpecularID() : LLUUID::null);
+    retval = LLPrimitive::setTEMaterialParams(te, pMaterialParams);
+    LL_DEBUGS("Material") << "Changing material params for te " << (S32)te
+                            << ", object " << mID
+                           << " (" << retval << ")"
+                            << LL_ENDL;
+    setTENormalMap(te, (pMaterialParams) ? pMaterialParams->getNormalID() : LLUUID::null);
+    setTESpecularMap(te, (pMaterialParams) ? pMaterialParams->getSpecularID() : LLUUID::null);
 
-	return retval;
+    return retval;
 }
 
 S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_mat)
@@ -5503,287 +5503,287 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma
 
 void LLViewerObject::refreshMaterials()
 {
-	setChanged(TEXTURE);
-	if (mDrawable.notNull())
-	{
-		gPipeline.markTextured(mDrawable);
-	}
+    setChanged(TEXTURE);
+    if (mDrawable.notNull())
+    {
+        gPipeline.markTextured(mDrawable);
+    }
 }
 
 S32 LLViewerObject::setTEScale(const U8 te, const F32 s, const F32 t)
 {
-	S32 retval = 0;
-	retval = LLPrimitive::setTEScale(te, s, t);
-	setChanged(TEXTURE);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-	}
-	return retval;
+    S32 retval = 0;
+    retval = LLPrimitive::setTEScale(te, s, t);
+    setChanged(TEXTURE);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEScaleS(const U8 te, const F32 s)
 {
-	S32 retval = LLPrimitive::setTEScaleS(te, s);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-	}
+    S32 retval = LLPrimitive::setTEScaleS(te, s);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    }
 
-	return retval;
+    return retval;
 }
 
 S32 LLViewerObject::setTEScaleT(const U8 te, const F32 t)
 {
-	S32 retval = LLPrimitive::setTEScaleT(te, t);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-	}
+    S32 retval = LLPrimitive::setTEScaleT(te, t);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    }
 
-	return retval;
+    return retval;
 }
 
 S32 LLViewerObject::setTEOffset(const U8 te, const F32 s, const F32 t)
 {
-	S32 retval = LLPrimitive::setTEOffset(te, s, t);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-	}
-	return retval;
+    S32 retval = LLPrimitive::setTEOffset(te, s, t);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    }
+    return retval;
 }
 
 S32 LLViewerObject::setTEOffsetS(const U8 te, const F32 s)
 {
-	S32 retval = LLPrimitive::setTEOffsetS(te, s);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-	}
+    S32 retval = LLPrimitive::setTEOffsetS(te, s);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    }
 
-	return retval;
+    return retval;
 }
 
 S32 LLViewerObject::setTEOffsetT(const U8 te, const F32 t)
 {
-	S32 retval = LLPrimitive::setTEOffsetT(te, t);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-	}
+    S32 retval = LLPrimitive::setTEOffsetT(te, t);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    }
 
-	return retval;
+    return retval;
 }
 
 S32 LLViewerObject::setTERotation(const U8 te, const F32 r)
 {
-	S32 retval = LLPrimitive::setTERotation(te, r);
-	if (mDrawable.notNull() && retval)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
+    S32 retval = LLPrimitive::setTERotation(te, r);
+    if (mDrawable.notNull() && retval)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
         shrinkWrap();
-	}
-	return retval;
+    }
+    return retval;
 }
 
 
 LLViewerTexture *LLViewerObject::getTEImage(const U8 face) const
 {
-//	llassert(mTEImages);
+//  llassert(mTEImages);
 
-	if (face < getNumTEs())
-	{
-		LLViewerTexture* image = mTEImages[face];
-		if (image)
-		{
-			return image;
-		}
-		else
-		{
-			return (LLViewerTexture*)(LLViewerFetchedTexture::sDefaultImagep);
-		}
-	}
+    if (face < getNumTEs())
+    {
+        LLViewerTexture* image = mTEImages[face];
+        if (image)
+        {
+            return image;
+        }
+        else
+        {
+            return (LLViewerTexture*)(LLViewerFetchedTexture::sDefaultImagep);
+        }
+    }
 
-	LL_ERRS() << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << LL_ENDL;
+    LL_ERRS() << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << LL_ENDL;
 
-	return NULL;
+    return NULL;
 }
 
 
 bool LLViewerObject::isImageAlphaBlended(const U8 te) const
 {
-	LLViewerTexture* image = getTEImage(te);
-	LLGLenum format = image ? image->getPrimaryFormat() : GL_RGB;
-	switch (format)
-	{
-		case GL_RGBA:
-		case GL_ALPHA:
-		{
-			return true;
-		}
-		break;
+    LLViewerTexture* image = getTEImage(te);
+    LLGLenum format = image ? image->getPrimaryFormat() : GL_RGB;
+    switch (format)
+    {
+        case GL_RGBA:
+        case GL_ALPHA:
+        {
+            return true;
+        }
+        break;
 
-		case GL_RGB: break;
-		default:
-		{
-			LL_WARNS() << "Unexpected tex format in LLViewerObject::isImageAlphaBlended...returning no alpha." << LL_ENDL;
-		}
-		break;
-	}
+        case GL_RGB: break;
+        default:
+        {
+            LL_WARNS() << "Unexpected tex format in LLViewerObject::isImageAlphaBlended...returning no alpha." << LL_ENDL;
+        }
+        break;
+    }
 
-	return false;
+    return false;
 }
 
 LLViewerTexture *LLViewerObject::getTENormalMap(const U8 face) const
 {
-	//	llassert(mTEImages);
-	
-	if (face < getNumTEs())
-	{
-		LLViewerTexture* image = mTENormalMaps[face];
-		if (image)
-		{
-			return image;
-		}
-		else
-		{
-			return (LLViewerTexture*)(LLViewerFetchedTexture::sDefaultImagep);
-		}
-	}
-	
-	LL_ERRS() << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << LL_ENDL;
-	
-	return NULL;
+    //  llassert(mTEImages);
+
+    if (face < getNumTEs())
+    {
+        LLViewerTexture* image = mTENormalMaps[face];
+        if (image)
+        {
+            return image;
+        }
+        else
+        {
+            return (LLViewerTexture*)(LLViewerFetchedTexture::sDefaultImagep);
+        }
+    }
+
+    LL_ERRS() << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << LL_ENDL;
+
+    return NULL;
 }
 
 LLViewerTexture *LLViewerObject::getTESpecularMap(const U8 face) const
 {
-	//	llassert(mTEImages);
-	
-	if (face < getNumTEs())
-	{
-		LLViewerTexture* image = mTESpecularMaps[face];
-		if (image)
-		{
-			return image;
-		}
-		else
-		{
-			return (LLViewerTexture*)(LLViewerFetchedTexture::sDefaultImagep);
-		}
-	}
-	
-	LL_ERRS() << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << LL_ENDL;
-	
-	return NULL;
+    //  llassert(mTEImages);
+
+    if (face < getNumTEs())
+    {
+        LLViewerTexture* image = mTESpecularMaps[face];
+        if (image)
+        {
+            return image;
+        }
+        else
+        {
+            return (LLViewerTexture*)(LLViewerFetchedTexture::sDefaultImagep);
+        }
+    }
+
+    LL_ERRS() << llformat("Requested Image from invalid face: %d/%d",face,getNumTEs()) << LL_ENDL;
+
+    return NULL;
 }
 
 void LLViewerObject::fitFaceTexture(const U8 face)
 {
-	LL_INFOS() << "fitFaceTexture not implemented" << LL_ENDL;
+    LL_INFOS() << "fitFaceTexture not implemented" << LL_ENDL;
 }
 
 LLBBox LLViewerObject::getBoundingBoxAgent() const
 {
-	LLVector3 position_agent;
-	LLQuaternion rot;
-	LLViewerObject* avatar_parent = NULL;
-	LLViewerObject* root_edit = (LLViewerObject*)getRootEdit();
-	if (root_edit)
-	{
-		avatar_parent = (LLViewerObject*)root_edit->getParent();
-	}
-	
-	if (avatar_parent && avatar_parent->isAvatar() &&
-		root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent())
-	{
-		LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent();
-		position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
-		rot = getRotationEdit() * parent_xform->getWorldRotation();
-	}
-	else
-	{
-		position_agent = getPositionAgent();
-		rot = getRotationRegion();
-	}
-	
-	return LLBBox( position_agent, rot, getScale() * -0.5f, getScale() * 0.5f );
+    LLVector3 position_agent;
+    LLQuaternion rot;
+    LLViewerObject* avatar_parent = NULL;
+    LLViewerObject* root_edit = (LLViewerObject*)getRootEdit();
+    if (root_edit)
+    {
+        avatar_parent = (LLViewerObject*)root_edit->getParent();
+    }
+
+    if (avatar_parent && avatar_parent->isAvatar() &&
+        root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent())
+    {
+        LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent();
+        position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
+        rot = getRotationEdit() * parent_xform->getWorldRotation();
+    }
+    else
+    {
+        position_agent = getPositionAgent();
+        rot = getRotationRegion();
+    }
+
+    return LLBBox( position_agent, rot, getScale() * -0.5f, getScale() * 0.5f );
 }
 
 U32 LLViewerObject::getNumVertices() const
 {
-	U32 num_vertices = 0;
-	if (mDrawable.notNull())
-	{
-		S32 i, num_faces;
-		num_faces = mDrawable->getNumFaces();
-		for (i = 0; i < num_faces; i++)
-		{
-			LLFace * facep = mDrawable->getFace(i);
-			if (facep)
-			{
-				num_vertices += facep->getGeomCount();
-			}
-		}
-	}
-	return num_vertices;
+    U32 num_vertices = 0;
+    if (mDrawable.notNull())
+    {
+        S32 i, num_faces;
+        num_faces = mDrawable->getNumFaces();
+        for (i = 0; i < num_faces; i++)
+        {
+            LLFace * facep = mDrawable->getFace(i);
+            if (facep)
+            {
+                num_vertices += facep->getGeomCount();
+            }
+        }
+    }
+    return num_vertices;
 }
 
 U32 LLViewerObject::getNumIndices() const
 {
-	U32 num_indices = 0;
-	if (mDrawable.notNull())
-	{
-		S32 i, num_faces;
-		num_faces = mDrawable->getNumFaces();
-		for (i = 0; i < num_faces; i++)
-		{
-			LLFace * facep = mDrawable->getFace(i);
-			if (facep)
-			{
-				num_indices += facep->getIndicesCount();
-			}
-		}
-	}
-	return num_indices;
+    U32 num_indices = 0;
+    if (mDrawable.notNull())
+    {
+        S32 i, num_faces;
+        num_faces = mDrawable->getNumFaces();
+        for (i = 0; i < num_faces; i++)
+        {
+            LLFace * facep = mDrawable->getFace(i);
+            if (facep)
+            {
+                num_indices += facep->getIndicesCount();
+            }
+        }
+    }
+    return num_indices;
 }
 
 // Find the number of instances of this object's inventory that are of the given type
 S32 LLViewerObject::countInventoryContents(LLAssetType::EType type)
 {
-	S32 count = 0;
-	if( mInventory )
-	{
-		LLInventoryObject::object_list_t::const_iterator it = mInventory->begin();
-		LLInventoryObject::object_list_t::const_iterator end = mInventory->end();
-		for(  ; it != end ; ++it )
-		{
-			if( (*it)->getType() == type )
-			{
-				++count;
-			}
-		}
-	}
-	return count;
+    S32 count = 0;
+    if( mInventory )
+    {
+        LLInventoryObject::object_list_t::const_iterator it = mInventory->begin();
+        LLInventoryObject::object_list_t::const_iterator end = mInventory->end();
+        for(  ; it != end ; ++it )
+        {
+            if( (*it)->getType() == type )
+            {
+                ++count;
+            }
+        }
+    }
+    return count;
 }
 
 void LLViewerObject::setDebugText(const std::string &utf8text, const LLColor4& color)
 {
-	if (utf8text.empty() && !mText)
-	{
-		return;
-	}
+    if (utf8text.empty() && !mText)
+    {
+        return;
+    }
 
-	if (!mText)
-	{
-	    initHudText();
-	}
-	mText->setColor(color);
-	mText->setString(utf8text);
-	mText->setZCompare(FALSE);
-	mText->setDoFade(FALSE);
-	updateText();
+    if (!mText)
+    {
+        initHudText();
+    }
+    mText->setColor(color);
+    mText->setString(utf8text);
+    mText->setZCompare(FALSE);
+    mText->setDoFade(FALSE);
+    updateText();
 }
 
 void LLViewerObject::appendDebugText(const std::string &utf8text)
@@ -5842,98 +5842,98 @@ void LLViewerObject::restoreHudText()
 
 void LLViewerObject::setIcon(LLViewerTexture* icon_image)
 {
-	if (!mIcon)
-	{
-		mIcon = (LLHUDIcon *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_ICON);
-		mIcon->setSourceObject(this);
-		mIcon->setImage(icon_image);
-		// *TODO: make this user configurable
-		mIcon->setScale(0.03f);
-	}
-	else
-	{
-		mIcon->restartLifeTimer();
-	}
+    if (!mIcon)
+    {
+        mIcon = (LLHUDIcon *)LLHUDObject::addHUDObject(LLHUDObject::LL_HUD_ICON);
+        mIcon->setSourceObject(this);
+        mIcon->setImage(icon_image);
+        // *TODO: make this user configurable
+        mIcon->setScale(0.03f);
+    }
+    else
+    {
+        mIcon->restartLifeTimer();
+    }
 }
 
 void LLViewerObject::clearIcon()
 {
-	if (mIcon)
-	{
-		mIcon = NULL;
-	}
+    if (mIcon)
+    {
+        mIcon = NULL;
+    }
 }
 
-LLViewerObject* LLViewerObject::getSubParent() 
-{ 
-	return (LLViewerObject*) getParent();
+LLViewerObject* LLViewerObject::getSubParent()
+{
+    return (LLViewerObject*) getParent();
 }
 
 const LLViewerObject* LLViewerObject::getSubParent() const
 {
-	return (const LLViewerObject*) getParent();
+    return (const LLViewerObject*) getParent();
 }
 
 BOOL LLViewerObject::isOnMap()
 {
-	return mOnMap;
+    return mOnMap;
 }
 
 
 void LLViewerObject::updateText()
 {
-	if (!isDead())
-	{
-		if (mText.notNull())
-		{		
-		    LLVOAvatar* avatar = getAvatar();
-		    if (avatar)
-		    {
-		        mText->setHidden(avatar->isInMuteList());
-		    }
-
-		    LLVector3 up_offset(0,0,0);
-			up_offset.mV[2] = getScale().mV[VZ]*0.6f;
-			
-			if (mDrawable.notNull())
-			{
-				mText->setPositionAgent(getRenderPosition() + up_offset);
-			}
-			else
-			{
-				mText->setPositionAgent(getPositionAgent() + up_offset);
-			}
-		}
-	}
+    if (!isDead())
+    {
+        if (mText.notNull())
+        {
+            LLVOAvatar* avatar = getAvatar();
+            if (avatar)
+            {
+                mText->setHidden(avatar->isInMuteList());
+            }
+
+            LLVector3 up_offset(0,0,0);
+            up_offset.mV[2] = getScale().mV[VZ]*0.6f;
+
+            if (mDrawable.notNull())
+            {
+                mText->setPositionAgent(getRenderPosition() + up_offset);
+            }
+            else
+            {
+                mText->setPositionAgent(getPositionAgent() + up_offset);
+            }
+        }
+    }
 }
 
 bool LLViewerObject::isOwnerInMuteList(LLUUID id)
 {
-	LLUUID owner_id = id.isNull() ? mOwnerID : id;
-	if (isAvatar() || owner_id.isNull())
-	{
-		return false;
-	}
-	bool muted = false;
-	F64 now = LLFrameTimer::getTotalSeconds();
-	if (now < mCachedMuteListUpdateTime)
-	{
-		muted = mCachedOwnerInMuteList;
-	}
-	else
-	{
-		muted = LLMuteList::getInstance()->isMuted(owner_id);
-
-		const F64 SECONDS_BETWEEN_MUTE_UPDATES = 1;
-		mCachedMuteListUpdateTime = now + SECONDS_BETWEEN_MUTE_UPDATES;
-		mCachedOwnerInMuteList = muted;
-	}
-	return muted;
+    LLUUID owner_id = id.isNull() ? mOwnerID : id;
+    if (isAvatar() || owner_id.isNull())
+    {
+        return false;
+    }
+    bool muted = false;
+    F64 now = LLFrameTimer::getTotalSeconds();
+    if (now < mCachedMuteListUpdateTime)
+    {
+        muted = mCachedOwnerInMuteList;
+    }
+    else
+    {
+        muted = LLMuteList::getInstance()->isMuted(owner_id);
+
+        const F64 SECONDS_BETWEEN_MUTE_UPDATES = 1;
+        mCachedMuteListUpdateTime = now + SECONDS_BETWEEN_MUTE_UPDATES;
+        mCachedOwnerInMuteList = muted;
+    }
+    return muted;
 }
 
 LLVOAvatar* LLViewerObject::asAvatar()
 {
-	return NULL;
+    return NULL;
 }
 
 // If this object is directly or indirectly parented by an avatar,
@@ -5945,348 +5945,348 @@ LLVOAvatar* LLViewerObject::asAvatar()
 // attached.
 LLVOAvatar* LLViewerObject::getAvatarAncestor()
 {
-	LLViewerObject *pobj = (LLViewerObject*) getParent();
-	while (pobj)
-	{
-		LLVOAvatar *av = pobj->asAvatar();
-		if (av)
-		{
-			return av;
-		}
-		pobj =  (LLViewerObject*) pobj->getParent();
-	}
-	return NULL;
+    LLViewerObject *pobj = (LLViewerObject*) getParent();
+    while (pobj)
+    {
+        LLVOAvatar *av = pobj->asAvatar();
+        if (av)
+        {
+            return av;
+        }
+        pobj =  (LLViewerObject*) pobj->getParent();
+    }
+    return NULL;
 }
 
 BOOL LLViewerObject::isParticleSource() const
 {
-	return !mPartSourcep.isNull() && !mPartSourcep->isDead();
+    return !mPartSourcep.isNull() && !mPartSourcep->isDead();
 }
 
 void LLViewerObject::setParticleSource(const LLPartSysData& particle_parameters, const LLUUID& owner_id)
 {
-	if (mPartSourcep)
-	{
-		deleteParticleSource();
-	}
-
-	LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::createPSS(this, particle_parameters);
-	mPartSourcep = pss;
-	
-	if (mPartSourcep)
-	{
-		mPartSourcep->setOwnerUUID(owner_id);
-
-		if (mPartSourcep->getImage()->getID() != mPartSourcep->mPartSysData.mPartImageID)
-		{
-			LLViewerTexture* image;
-			if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
-			{
-				image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.tga");
-			}
-			else
-			{
-				image = LLViewerTextureManager::getFetchedTexture(mPartSourcep->mPartSysData.mPartImageID);
-			}
-			mPartSourcep->setImage(image);
-		}
-	}
-	LLViewerPartSim::getInstance()->addPartSource(pss);
+    if (mPartSourcep)
+    {
+        deleteParticleSource();
+    }
+
+    LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::createPSS(this, particle_parameters);
+    mPartSourcep = pss;
+
+    if (mPartSourcep)
+    {
+        mPartSourcep->setOwnerUUID(owner_id);
+
+        if (mPartSourcep->getImage()->getID() != mPartSourcep->mPartSysData.mPartImageID)
+        {
+            LLViewerTexture* image;
+            if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
+            {
+                image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.tga");
+            }
+            else
+            {
+                image = LLViewerTextureManager::getFetchedTexture(mPartSourcep->mPartSysData.mPartImageID);
+            }
+            mPartSourcep->setImage(image);
+        }
+    }
+    LLViewerPartSim::getInstance()->addPartSource(pss);
 }
 
 void LLViewerObject::unpackParticleSource(const S32 block_num, const LLUUID& owner_id)
 {
-	if (!mPartSourcep.isNull() && mPartSourcep->isDead())
-	{
-		mPartSourcep = NULL;
-	}
-	if (mPartSourcep)
-	{
-		// If we've got one already, just update the existing source (or remove it)
-		if (!LLViewerPartSourceScript::unpackPSS(this, mPartSourcep, block_num))
-		{
-			mPartSourcep->setDead();
-			mPartSourcep = NULL;
-		}
-	}
-	else
-	{
-		LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, block_num);
-		//If the owner is muted, don't create the system
-		if(LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagParticles)) return;
-
-		// We need to be able to deal with a particle source that hasn't changed, but still got an update!
-		if (pss)
-		{
-// 			LL_INFOS() << "Making particle system with owner " << owner_id << LL_ENDL;
-			pss->setOwnerUUID(owner_id);
-			mPartSourcep = pss;
-			LLViewerPartSim::getInstance()->addPartSource(pss);
-		}
-	}
-	if (mPartSourcep)
-	{
-		if (mPartSourcep->getImage()->getID() != mPartSourcep->mPartSysData.mPartImageID)
-		{
-			LLViewerTexture* image;
-			if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
-			{
-				image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
-			}
-			else
-			{
-				image = LLViewerTextureManager::getFetchedTexture(mPartSourcep->mPartSysData.mPartImageID);
-			}
-			mPartSourcep->setImage(image);
-		}
-	}
+    if (!mPartSourcep.isNull() && mPartSourcep->isDead())
+    {
+        mPartSourcep = NULL;
+    }
+    if (mPartSourcep)
+    {
+        // If we've got one already, just update the existing source (or remove it)
+        if (!LLViewerPartSourceScript::unpackPSS(this, mPartSourcep, block_num))
+        {
+            mPartSourcep->setDead();
+            mPartSourcep = NULL;
+        }
+    }
+    else
+    {
+        LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, block_num);
+        //If the owner is muted, don't create the system
+        if(LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagParticles)) return;
+
+        // We need to be able to deal with a particle source that hasn't changed, but still got an update!
+        if (pss)
+        {
+//          LL_INFOS() << "Making particle system with owner " << owner_id << LL_ENDL;
+            pss->setOwnerUUID(owner_id);
+            mPartSourcep = pss;
+            LLViewerPartSim::getInstance()->addPartSource(pss);
+        }
+    }
+    if (mPartSourcep)
+    {
+        if (mPartSourcep->getImage()->getID() != mPartSourcep->mPartSysData.mPartImageID)
+        {
+            LLViewerTexture* image;
+            if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
+            {
+                image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
+            }
+            else
+            {
+                image = LLViewerTextureManager::getFetchedTexture(mPartSourcep->mPartSysData.mPartImageID);
+            }
+            mPartSourcep->setImage(image);
+        }
+    }
 }
 
 void LLViewerObject::unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_id, bool legacy)
 {
-	if (!mPartSourcep.isNull() && mPartSourcep->isDead())
-	{
-		mPartSourcep = NULL;
-	}
-	if (mPartSourcep)
-	{
-		// If we've got one already, just update the existing source (or remove it)
-		if (!LLViewerPartSourceScript::unpackPSS(this, mPartSourcep, dp, legacy))
-		{
-			mPartSourcep->setDead();
-			mPartSourcep = NULL;
-		}
-	}
-	else
-	{
-		LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, dp, legacy);
-		//If the owner is muted, don't create the system
-		if(LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagParticles)) return;
-		// We need to be able to deal with a particle source that hasn't changed, but still got an update!
-		if (pss)
-		{
-// 			LL_INFOS() << "Making particle system with owner " << owner_id << LL_ENDL;
-			pss->setOwnerUUID(owner_id);
-			mPartSourcep = pss;
-			LLViewerPartSim::getInstance()->addPartSource(pss);
-		}
-	}
-	if (mPartSourcep)
-	{
-		if (mPartSourcep->getImage()->getID() != mPartSourcep->mPartSysData.mPartImageID)
-		{
-			LLViewerTexture* image;
-			if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
-			{
-				image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
-			}
-			else
-			{
-				image = LLViewerTextureManager::getFetchedTexture(mPartSourcep->mPartSysData.mPartImageID);
-			}
-			mPartSourcep->setImage(image);
-		}
-	}
+    if (!mPartSourcep.isNull() && mPartSourcep->isDead())
+    {
+        mPartSourcep = NULL;
+    }
+    if (mPartSourcep)
+    {
+        // If we've got one already, just update the existing source (or remove it)
+        if (!LLViewerPartSourceScript::unpackPSS(this, mPartSourcep, dp, legacy))
+        {
+            mPartSourcep->setDead();
+            mPartSourcep = NULL;
+        }
+    }
+    else
+    {
+        LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::unpackPSS(this, NULL, dp, legacy);
+        //If the owner is muted, don't create the system
+        if(LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagParticles)) return;
+        // We need to be able to deal with a particle source that hasn't changed, but still got an update!
+        if (pss)
+        {
+//          LL_INFOS() << "Making particle system with owner " << owner_id << LL_ENDL;
+            pss->setOwnerUUID(owner_id);
+            mPartSourcep = pss;
+            LLViewerPartSim::getInstance()->addPartSource(pss);
+        }
+    }
+    if (mPartSourcep)
+    {
+        if (mPartSourcep->getImage()->getID() != mPartSourcep->mPartSysData.mPartImageID)
+        {
+            LLViewerTexture* image;
+            if (mPartSourcep->mPartSysData.mPartImageID == LLUUID::null)
+            {
+                image = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
+            }
+            else
+            {
+                image = LLViewerTextureManager::getFetchedTexture(mPartSourcep->mPartSysData.mPartImageID);
+            }
+            mPartSourcep->setImage(image);
+        }
+    }
 }
 
 void LLViewerObject::deleteParticleSource()
 {
-	if (mPartSourcep.notNull())
-	{
-		mPartSourcep->setDead();
-		mPartSourcep = NULL;
-	}
+    if (mPartSourcep.notNull())
+    {
+        mPartSourcep->setDead();
+        mPartSourcep = NULL;
+    }
 }
 
 // virtual
 void LLViewerObject::updateDrawable(BOOL force_damped)
 {
-	if (!isChanged(MOVED))
-	{ //most common case, having an empty if case here makes for better branch prediction
-	}
-	else if (mDrawable.notNull() && 
-		!mDrawable->isState(LLDrawable::ON_MOVE_LIST))
-	{
-		BOOL damped_motion = 
-			!isChanged(SHIFTED) &&										// not shifted between regions this frame and...
-			(	force_damped ||										// ...forced into damped motion by application logic or...
-				(	!isSelected() &&									// ...not selected and...
-					(	mDrawable->isRoot() ||								// ... is root or ...
-						(getParent() && !((LLViewerObject*)getParent())->isSelected())// ... parent is not selected and ...
-					) &&	
-					getPCode() == LL_PCODE_VOLUME &&					// ...is a volume object and...
-					getVelocity().isExactlyZero() &&					// ...is not moving physically and...
-					mDrawable->getGeneration() != -1                    // ...was not created this frame.
-				)					
-			);
-		gPipeline.markMoved(mDrawable, damped_motion);
-	}
-	clearChanged(SHIFTED);
+    if (!isChanged(MOVED))
+    { //most common case, having an empty if case here makes for better branch prediction
+    }
+    else if (mDrawable.notNull() &&
+        !mDrawable->isState(LLDrawable::ON_MOVE_LIST))
+    {
+        BOOL damped_motion =
+            !isChanged(SHIFTED) &&                                      // not shifted between regions this frame and...
+            (   force_damped ||                                     // ...forced into damped motion by application logic or...
+                (   !isSelected() &&                                    // ...not selected and...
+                    (   mDrawable->isRoot() ||                              // ... is root or ...
+                        (getParent() && !((LLViewerObject*)getParent())->isSelected())// ... parent is not selected and ...
+                    ) &&
+                    getPCode() == LL_PCODE_VOLUME &&                    // ...is a volume object and...
+                    getVelocity().isExactlyZero() &&                    // ...is not moving physically and...
+                    mDrawable->getGeneration() != -1                    // ...was not created this frame.
+                )
+            );
+        gPipeline.markMoved(mDrawable, damped_motion);
+    }
+    clearChanged(SHIFTED);
 }
 
 // virtual, overridden by LLVOVolume
 F32 LLViewerObject::getVObjRadius() const
 {
-	return mDrawable.notNull() ? mDrawable->getRadius() : 0.f;
+    return mDrawable.notNull() ? mDrawable->getRadius() : 0.f;
 }
 
 void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& owner_id, const F32 gain, const U8 flags)
 {
-	if (!gAudiop)
-	{
-		return;
-	}
-	
-	if (audio_uuid.isNull())
-	{
-		if (!mAudioSourcep)
-		{
-			return;
-		}
-		if (mAudioSourcep->isLoop() && !mAudioSourcep->hasPendingPreloads())
-		{
-			// We don't clear the sound if it's a loop, it'll go away on its own.
-			// At least, this appears to be how the scripts work.
-			// The attached sound ID is set to NULL to avoid it playing back when the
-			// object rezzes in on non-looping sounds.
-			//LL_INFOS() << "Clearing attached sound " << mAudioSourcep->getCurrentData()->getID() << LL_ENDL;
-			gAudiop->cleanupAudioSource(mAudioSourcep);
-			mAudioSourcep = NULL;
-		}
-		else if (flags & LL_SOUND_FLAG_STOP)
-        {
-			// Just shut off the sound
-			mAudioSourcep->stop();
-		}
-		return;
-	}
-	if (flags & LL_SOUND_FLAG_LOOP
-		&& mAudioSourcep && mAudioSourcep->isLoop() && mAudioSourcep->getCurrentData()
-		&& mAudioSourcep->getCurrentData()->getID() == audio_uuid)
-	{
-		//LL_INFOS() << "Already playing this sound on a loop, ignoring" << LL_ENDL;
-		return;
-	}
-
-	// don't clean up before previous sound is done. Solves: SL-33486
-	if ( mAudioSourcep && mAudioSourcep->isDone() ) 
-	{
-		gAudiop->cleanupAudioSource(mAudioSourcep);
-		mAudioSourcep = NULL;
-	}
-
-	if (mAudioSourcep && mAudioSourcep->isMuted() &&
-	    mAudioSourcep->getCurrentData() && mAudioSourcep->getCurrentData()->getID() == audio_uuid)
-	{
-		//LL_INFOS() << "Already having this sound as muted sound, ignoring" << LL_ENDL;
-		return;
-	}
-
-	getAudioSource(owner_id);
-
-	if (mAudioSourcep)
-	{
-		BOOL queue = flags & LL_SOUND_FLAG_QUEUE;
-		mAudioGain = gain;
-		mAudioSourcep->setGain(gain);
-		mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP);
-		mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER);
-		mAudioSourcep->setSyncSlave(flags & LL_SOUND_FLAG_SYNC_SLAVE);
-		mAudioSourcep->setQueueSounds(queue);
-		if(!queue) // stop any current sound first to avoid "farts of doom" (SL-1541) -MG
-		{
-			mAudioSourcep->stop();
-		}
-		
-		// Play this sound if region maturity permits
-		if( gAgent.canAccessMaturityAtGlobal(this->getPositionGlobal()) )
-		{
-			//LL_INFOS() << "Playing attached sound " << audio_uuid << LL_ENDL;
-			// recheck cutoff radius in case this update was an object-update with new value
-			mAudioSourcep->checkCutOffRadius();
-			mAudioSourcep->play(audio_uuid);
-		}
-	}
+    if (!gAudiop)
+    {
+        return;
+    }
+
+    if (audio_uuid.isNull())
+    {
+        if (!mAudioSourcep)
+        {
+            return;
+        }
+        if (mAudioSourcep->isLoop() && !mAudioSourcep->hasPendingPreloads())
+        {
+            // We don't clear the sound if it's a loop, it'll go away on its own.
+            // At least, this appears to be how the scripts work.
+            // The attached sound ID is set to NULL to avoid it playing back when the
+            // object rezzes in on non-looping sounds.
+            //LL_INFOS() << "Clearing attached sound " << mAudioSourcep->getCurrentData()->getID() << LL_ENDL;
+            gAudiop->cleanupAudioSource(mAudioSourcep);
+            mAudioSourcep = NULL;
+        }
+        else if (flags & LL_SOUND_FLAG_STOP)
+        {
+            // Just shut off the sound
+            mAudioSourcep->stop();
+        }
+        return;
+    }
+    if (flags & LL_SOUND_FLAG_LOOP
+        && mAudioSourcep && mAudioSourcep->isLoop() && mAudioSourcep->getCurrentData()
+        && mAudioSourcep->getCurrentData()->getID() == audio_uuid)
+    {
+        //LL_INFOS() << "Already playing this sound on a loop, ignoring" << LL_ENDL;
+        return;
+    }
+
+    // don't clean up before previous sound is done. Solves: SL-33486
+    if ( mAudioSourcep && mAudioSourcep->isDone() )
+    {
+        gAudiop->cleanupAudioSource(mAudioSourcep);
+        mAudioSourcep = NULL;
+    }
+
+    if (mAudioSourcep && mAudioSourcep->isMuted() &&
+        mAudioSourcep->getCurrentData() && mAudioSourcep->getCurrentData()->getID() == audio_uuid)
+    {
+        //LL_INFOS() << "Already having this sound as muted sound, ignoring" << LL_ENDL;
+        return;
+    }
+
+    getAudioSource(owner_id);
+
+    if (mAudioSourcep)
+    {
+        BOOL queue = flags & LL_SOUND_FLAG_QUEUE;
+        mAudioGain = gain;
+        mAudioSourcep->setGain(gain);
+        mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP);
+        mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER);
+        mAudioSourcep->setSyncSlave(flags & LL_SOUND_FLAG_SYNC_SLAVE);
+        mAudioSourcep->setQueueSounds(queue);
+        if(!queue) // stop any current sound first to avoid "farts of doom" (SL-1541) -MG
+        {
+            mAudioSourcep->stop();
+        }
+
+        // Play this sound if region maturity permits
+        if( gAgent.canAccessMaturityAtGlobal(this->getPositionGlobal()) )
+        {
+            //LL_INFOS() << "Playing attached sound " << audio_uuid << LL_ENDL;
+            // recheck cutoff radius in case this update was an object-update with new value
+            mAudioSourcep->checkCutOffRadius();
+            mAudioSourcep->play(audio_uuid);
+        }
+    }
 }
 
 LLAudioSource *LLViewerObject::getAudioSource(const LLUUID& owner_id)
 {
-	if (!mAudioSourcep)
-	{
-		// Arbitrary low gain for a sound that's not playing.
-		// This is used for sound preloads, for example.
-		LLAudioSourceVO *asvop = new LLAudioSourceVO(mID, owner_id, 0.01f, this);
+    if (!mAudioSourcep)
+    {
+        // Arbitrary low gain for a sound that's not playing.
+        // This is used for sound preloads, for example.
+        LLAudioSourceVO *asvop = new LLAudioSourceVO(mID, owner_id, 0.01f, this);
 
-		mAudioSourcep = asvop;
-		if(gAudiop)
-		{
-			gAudiop->addAudioSource(asvop);
-		}
-	}
+        mAudioSourcep = asvop;
+        if(gAudiop)
+        {
+            gAudiop->addAudioSource(asvop);
+        }
+    }
 
-	return mAudioSourcep;
+    return mAudioSourcep;
 }
 
 void LLViewerObject::adjustAudioGain(const F32 gain)
 {
-	if (mAudioSourcep)
-	{
-		mAudioGain = gain;
-		mAudioSourcep->setGain(mAudioGain);
-	}
+    if (mAudioSourcep)
+    {
+        mAudioGain = gain;
+        mAudioSourcep->setGain(mAudioGain);
+    }
 }
 
 //----------------------------------------------------------------------------
 
 bool LLViewerObject::unpackParameterEntry(U16 param_type, LLDataPacker *dp)
 {
-	if (LLNetworkData::PARAMS_MESH == param_type)
-	{
-		param_type = LLNetworkData::PARAMS_SCULPT;
-	}
-	ExtraParameter* param = getExtraParameterEntryCreate(param_type);
-	if (param)
-	{
-		param->data->unpack(*dp);
-		param->in_use = TRUE;
-		parameterChanged(param_type, param->data, TRUE, false);
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+    if (LLNetworkData::PARAMS_MESH == param_type)
+    {
+        param_type = LLNetworkData::PARAMS_SCULPT;
+    }
+    ExtraParameter* param = getExtraParameterEntryCreate(param_type);
+    if (param)
+    {
+        param->data->unpack(*dp);
+        param->in_use = TRUE;
+        parameterChanged(param_type, param->data, TRUE, false);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 param_type)
 {
-	LLNetworkData* new_block = NULL;
-	switch (param_type)
-	{
-	  case LLNetworkData::PARAMS_FLEXIBLE:
-	  {
-		  new_block = new LLFlexibleObjectData();
-		  break;
-	  }
-	  case LLNetworkData::PARAMS_LIGHT:
-	  {
-		  new_block = new LLLightParams();
-		  break;
-	  }
-	  case LLNetworkData::PARAMS_SCULPT:
-	  {
-		  new_block = new LLSculptParams();
-		  break;
-	  }
-	  case LLNetworkData::PARAMS_LIGHT_IMAGE:
-	  {
-		  new_block = new LLLightImageParams();
-		  break;
-	  }
+    LLNetworkData* new_block = NULL;
+    switch (param_type)
+    {
+      case LLNetworkData::PARAMS_FLEXIBLE:
+      {
+          new_block = new LLFlexibleObjectData();
+          break;
+      }
+      case LLNetworkData::PARAMS_LIGHT:
+      {
+          new_block = new LLLightParams();
+          break;
+      }
+      case LLNetworkData::PARAMS_SCULPT:
+      {
+          new_block = new LLSculptParams();
+          break;
+      }
+      case LLNetworkData::PARAMS_LIGHT_IMAGE:
+      {
+          new_block = new LLLightImageParams();
+          break;
+      }
       case LLNetworkData::PARAMS_EXTENDED_MESH:
       {
-		  new_block = new LLExtendedMeshParams();
-		  break;
+          new_block = new LLExtendedMeshParams();
+          break;
       }
       case LLNetworkData::PARAMS_RENDER_MATERIAL:
       {
@@ -6298,90 +6298,90 @@ LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 para
           new_block = new LLReflectionProbeParams();
           break;
       }
-	  default:
-	  {
-		  LL_INFOS_ONCE() << "Unknown param type: " << param_type << LL_ENDL;
-		  break;
-	  }
-	};
-
-	if (new_block)
-	{
-		ExtraParameter* new_entry = new ExtraParameter;
-		new_entry->data = new_block;
-		new_entry->in_use = false; // not in use yet
+      default:
+      {
+          LL_INFOS_ONCE() << "Unknown param type: " << param_type << LL_ENDL;
+          break;
+      }
+    };
+
+    if (new_block)
+    {
+        ExtraParameter* new_entry = new ExtraParameter;
+        new_entry->data = new_block;
+        new_entry->in_use = false; // not in use yet
         llassert(mExtraParameterList[param_type] == nullptr); // leak -- redundantly allocated parameter entry
-		mExtraParameterList[param_type] = new_entry;
-		return new_entry;
-	}
-	return NULL;
+        mExtraParameterList[param_type] = new_entry;
+        return new_entry;
+    }
+    return NULL;
 }
 
 LLViewerObject::ExtraParameter* LLViewerObject::getExtraParameterEntry(U16 param_type) const
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VIEWER;
-	std::unordered_map<U16, ExtraParameter*>::const_iterator itor = mExtraParameterList.find(param_type);
-	if (itor != mExtraParameterList.end())
-	{
-		return itor->second;
-	}
-	return NULL;
+    std::unordered_map<U16, ExtraParameter*>::const_iterator itor = mExtraParameterList.find(param_type);
+    if (itor != mExtraParameterList.end())
+    {
+        return itor->second;
+    }
+    return NULL;
 }
 
 LLViewerObject::ExtraParameter* LLViewerObject::getExtraParameterEntryCreate(U16 param_type)
 {
-	ExtraParameter* param = getExtraParameterEntry(param_type);
-	if (!param)
-	{
-		param = createNewParameterEntry(param_type);
-	}
-	return param;
+    ExtraParameter* param = getExtraParameterEntry(param_type);
+    if (!param)
+    {
+        param = createNewParameterEntry(param_type);
+    }
+    return param;
 }
 
 LLNetworkData* LLViewerObject::getParameterEntry(U16 param_type) const
 {
-	ExtraParameter* param = getExtraParameterEntry(param_type);
-	if (param)
-	{
-		return param->data;
-	}
-	else
-	{
-		return NULL;
-	}
+    ExtraParameter* param = getExtraParameterEntry(param_type);
+    if (param)
+    {
+        return param->data;
+    }
+    else
+    {
+        return NULL;
+    }
 }
 
 BOOL LLViewerObject::getParameterEntryInUse(U16 param_type) const
 {
-	ExtraParameter* param = getExtraParameterEntry(param_type);
-	if (param)
-	{
-		return param->in_use;
-	}
-	else
-	{
-		return FALSE;
-	}
+    ExtraParameter* param = getExtraParameterEntry(param_type);
+    if (param)
+    {
+        return param->in_use;
+    }
+    else
+    {
+        return FALSE;
+    }
 }
 
 bool LLViewerObject::setParameterEntry(U16 param_type, const LLNetworkData& new_value, bool local_origin)
 {
-	ExtraParameter* param = getExtraParameterEntryCreate(param_type);
-	if (param)
-	{
-		if (param->in_use && new_value == *(param->data))
-		{
-			return false;
-		}
-		param->in_use = true;
-		param->data->copy(new_value);
-		parameterChanged(param_type, param->data, TRUE, local_origin);
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+    ExtraParameter* param = getExtraParameterEntryCreate(param_type);
+    if (param)
+    {
+        if (param->in_use && new_value == *(param->data))
+        {
+            return false;
+        }
+        param->in_use = true;
+        param->data->copy(new_value);
+        parameterChanged(param_type, param->data, TRUE, local_origin);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 // Assumed to be called locally
@@ -6389,65 +6389,65 @@ bool LLViewerObject::setParameterEntry(U16 param_type, const LLNetworkData& new_
 // Should always return true.
 bool LLViewerObject::setParameterEntryInUse(U16 param_type, BOOL in_use, bool local_origin)
 {
-	ExtraParameter* param = getExtraParameterEntryCreate(param_type);
-	if (param && param->in_use != in_use)
-	{
-		param->in_use = in_use;
-		parameterChanged(param_type, param->data, in_use, local_origin);
-		return true;
-	}
-	return false;
+    ExtraParameter* param = getExtraParameterEntryCreate(param_type);
+    if (param && param->in_use != in_use)
+    {
+        param->in_use = in_use;
+        parameterChanged(param_type, param->data, in_use, local_origin);
+        return true;
+    }
+    return false;
 }
 
 void LLViewerObject::parameterChanged(U16 param_type, bool local_origin)
 {
-	ExtraParameter* param = getExtraParameterEntry(param_type);
-	if (param)
-	{
-		parameterChanged(param_type, param->data, param->in_use, local_origin);
-	}
+    ExtraParameter* param = getExtraParameterEntry(param_type);
+    if (param)
+    {
+        parameterChanged(param_type, param->data, param->in_use, local_origin);
+    }
 }
 
 void LLViewerObject::parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_use, bool local_origin)
 {
-	if (local_origin)
-	{
+    if (local_origin)
+    {
         // *NOTE: Do not send the render material ID in this way as it will get
         // out-of-sync with other sent client data.
         // See LLViewerObject::setRenderMaterialID and LLGLTFMaterialList
         llassert(param_type != LLNetworkData::PARAMS_RENDER_MATERIAL);
 
-		LLViewerRegion* regionp = getRegion();
-		if(!regionp) return;
-
-		// Change happened on the viewer. Send the change up
-		U8 tmp[MAX_OBJECT_PARAMS_SIZE];
-		LLDataPackerBinaryBuffer dpb(tmp, MAX_OBJECT_PARAMS_SIZE);
-		if (data->pack(dpb))
-		{
-			U32 datasize = (U32)dpb.getCurrentSize();
-
-			LLMessageSystem* msg = gMessageSystem;
-			msg->newMessageFast(_PREHASH_ObjectExtraParams);
-			msg->nextBlockFast(_PREHASH_AgentData);
-			msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-			msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-			msg->nextBlockFast(_PREHASH_ObjectData);
-			msg->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
-
-			msg->addU16Fast(_PREHASH_ParamType, param_type);
-			msg->addBOOLFast(_PREHASH_ParamInUse, in_use);
-
-			msg->addU32Fast(_PREHASH_ParamSize, datasize);
-			msg->addBinaryDataFast(_PREHASH_ParamData, tmp, datasize);
-
-			msg->sendReliable( regionp->getHost() );
-		}
-		else
-		{
-			LL_WARNS() << "Failed to send object extra parameters: " << param_type << LL_ENDL;
-		}
-	}
+        LLViewerRegion* regionp = getRegion();
+        if(!regionp) return;
+
+        // Change happened on the viewer. Send the change up
+        U8 tmp[MAX_OBJECT_PARAMS_SIZE];
+        LLDataPackerBinaryBuffer dpb(tmp, MAX_OBJECT_PARAMS_SIZE);
+        if (data->pack(dpb))
+        {
+            U32 datasize = (U32)dpb.getCurrentSize();
+
+            LLMessageSystem* msg = gMessageSystem;
+            msg->newMessageFast(_PREHASH_ObjectExtraParams);
+            msg->nextBlockFast(_PREHASH_AgentData);
+            msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+            msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+            msg->nextBlockFast(_PREHASH_ObjectData);
+            msg->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
+
+            msg->addU16Fast(_PREHASH_ParamType, param_type);
+            msg->addBOOLFast(_PREHASH_ParamInUse, in_use);
+
+            msg->addU32Fast(_PREHASH_ParamSize, datasize);
+            msg->addBinaryDataFast(_PREHASH_ParamData, tmp, datasize);
+
+            msg->sendReliable( regionp->getHost() );
+        }
+        else
+        {
+            LL_WARNS() << "Failed to send object extra parameters: " << param_type << LL_ENDL;
+        }
+    }
     else
     {
         if (param_type == LLNetworkData::PARAMS_RENDER_MATERIAL)
@@ -6460,256 +6460,256 @@ void LLViewerObject::parameterChanged(U16 param_type, LLNetworkData* data, BOOL
 
 void LLViewerObject::setDrawableState(U32 state, BOOL recursive)
 {
-	if (mDrawable)
-	{
-		mDrawable->setState(state);
-	}
-	if (recursive)
-	{
-		for (child_list_t::iterator iter = mChildList.begin();
-			 iter != mChildList.end(); iter++)
-		{
-			LLViewerObject* child = *iter;
-			child->setDrawableState(state, recursive);
-		}
-	}
+    if (mDrawable)
+    {
+        mDrawable->setState(state);
+    }
+    if (recursive)
+    {
+        for (child_list_t::iterator iter = mChildList.begin();
+             iter != mChildList.end(); iter++)
+        {
+            LLViewerObject* child = *iter;
+            child->setDrawableState(state, recursive);
+        }
+    }
 }
 
 void LLViewerObject::clearDrawableState(U32 state, BOOL recursive)
 {
-	if (mDrawable)
-	{
-		mDrawable->clearState(state);
-	}
-	if (recursive)
-	{
-		for (child_list_t::iterator iter = mChildList.begin();
-			 iter != mChildList.end(); iter++)
-		{
-			LLViewerObject* child = *iter;
-			child->clearDrawableState(state, recursive);
-		}
-	}
+    if (mDrawable)
+    {
+        mDrawable->clearState(state);
+    }
+    if (recursive)
+    {
+        for (child_list_t::iterator iter = mChildList.begin();
+             iter != mChildList.end(); iter++)
+        {
+            LLViewerObject* child = *iter;
+            child->clearDrawableState(state, recursive);
+        }
+    }
 }
 
 BOOL LLViewerObject::isDrawableState(U32 state, BOOL recursive) const
 {
-	BOOL matches = FALSE;
-	if (mDrawable)
-	{
-		matches = mDrawable->isState(state);
-	}
-	if (recursive)
-	{
-		for (child_list_t::const_iterator iter = mChildList.begin();
-			 (iter != mChildList.end()) && matches; iter++)
-		{
-			LLViewerObject* child = *iter;
-			matches &= child->isDrawableState(state, recursive);
-		}
-	}
+    BOOL matches = FALSE;
+    if (mDrawable)
+    {
+        matches = mDrawable->isState(state);
+    }
+    if (recursive)
+    {
+        for (child_list_t::const_iterator iter = mChildList.begin();
+             (iter != mChildList.end()) && matches; iter++)
+        {
+            LLViewerObject* child = *iter;
+            matches &= child->isDrawableState(state, recursive);
+        }
+    }
 
-	return matches;
+    return matches;
 }
 
 
 
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// RN: these functions assume a 2-level hierarchy 
+// RN: these functions assume a 2-level hierarchy
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 // Owned by anyone?
 BOOL LLViewerObject::permAnyOwner() const
-{ 
-	if (isRootEdit())
-	{
-		return flagObjectAnyOwner(); 
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permAnyOwner();
-	}
-}	
+{
+    if (isRootEdit())
+    {
+        return flagObjectAnyOwner();
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permAnyOwner();
+    }
+}
 // Owned by this viewer?
 BOOL LLViewerObject::permYouOwner() const
-{ 
-	if (isRootEdit())
-	{
+{
+    if (isRootEdit())
+    {
 #ifdef HACKED_GODLIKE_VIEWER
-		return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-		if (!LLGridManager::getInstance()->isInProductionGrid()
+        if (!LLGridManager::getInstance()->isInProductionGrid()
             && (gAgent.getGodLevel() >= GOD_MAINTENANCE))
-		{
-			return TRUE;
-		}
+        {
+            return TRUE;
+        }
 # endif
-		return flagObjectYouOwner(); 
+        return flagObjectYouOwner();
 #endif
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permYouOwner();
-	}
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permYouOwner();
+    }
 }
 
 // Owned by a group?
-BOOL LLViewerObject::permGroupOwner() const		
-{ 
-	if (isRootEdit())
-	{
-		return flagObjectGroupOwned(); 
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permGroupOwner();
-	}
+BOOL LLViewerObject::permGroupOwner() const
+{
+    if (isRootEdit())
+    {
+        return flagObjectGroupOwned();
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permGroupOwner();
+    }
 }
 
 // Can the owner edit
 BOOL LLViewerObject::permOwnerModify() const
-{ 
-	if (isRootEdit())
-	{
+{
+    if (isRootEdit())
+    {
 #ifdef HACKED_GODLIKE_VIEWER
-		return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-		if (!LLGridManager::getInstance()->isInProductionGrid()
+        if (!LLGridManager::getInstance()->isInProductionGrid()
             && (gAgent.getGodLevel() >= GOD_MAINTENANCE))
-	{
-			return TRUE;
-	}
+    {
+            return TRUE;
+    }
 # endif
-		return flagObjectOwnerModify(); 
+        return flagObjectOwnerModify();
 #endif
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permOwnerModify();
-	}
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permOwnerModify();
+    }
 }
 
 // Can edit
 BOOL LLViewerObject::permModify() const
-{ 
-	if (isRootEdit())
-	{
+{
+    if (isRootEdit())
+    {
 #ifdef HACKED_GODLIKE_VIEWER
-		return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-		if (!LLGridManager::getInstance()->isInProductionGrid()
+        if (!LLGridManager::getInstance()->isInProductionGrid()
             && (gAgent.getGodLevel() >= GOD_MAINTENANCE))
-	{
-			return TRUE;
-	}
+    {
+            return TRUE;
+    }
 # endif
-		return flagObjectModify(); 
+        return flagObjectModify();
 #endif
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permModify();
-	}
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permModify();
+    }
 }
 
 // Can copy
 BOOL LLViewerObject::permCopy() const
-{ 
-	if (isRootEdit())
-	{
+{
+    if (isRootEdit())
+    {
 #ifdef HACKED_GODLIKE_VIEWER
-		return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-		if (!LLGridManager::getInstance()->isInProductionGrid()
+        if (!LLGridManager::getInstance()->isInProductionGrid()
             && (gAgent.getGodLevel() >= GOD_MAINTENANCE))
-		{
-			return TRUE;
-		}
+        {
+            return TRUE;
+        }
 # endif
-		return flagObjectCopy();
+        return flagObjectCopy();
 #endif
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permCopy();
-	}
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permCopy();
+    }
 }
 
 // Can move
 BOOL LLViewerObject::permMove() const
 {
-	if (isRootEdit())
-	{
+    if (isRootEdit())
+    {
 #ifdef HACKED_GODLIKE_VIEWER
-		return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-		if (!LLGridManager::getInstance()->isInProductionGrid()
+        if (!LLGridManager::getInstance()->isInProductionGrid()
             && (gAgent.getGodLevel() >= GOD_MAINTENANCE))
-		{
-			return TRUE;
-		}
+        {
+            return TRUE;
+        }
 # endif
-		return flagObjectMove(); 
+        return flagObjectMove();
 #endif
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permMove();
-	}
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permMove();
+    }
 }
 
 // Can be transferred
 BOOL LLViewerObject::permTransfer() const
-{ 
-	if (isRootEdit())
-	{
+{
+    if (isRootEdit())
+    {
 #ifdef HACKED_GODLIKE_VIEWER
-		return TRUE;
+        return TRUE;
 #else
 # ifdef TOGGLE_HACKED_GODLIKE_VIEWER
-		if (!LLGridManager::getInstance()->isInProductionGrid()
+        if (!LLGridManager::getInstance()->isInProductionGrid()
             && (gAgent.getGodLevel() >= GOD_MAINTENANCE))
-		{
-			return TRUE;
-		}
+        {
+            return TRUE;
+        }
 # endif
-		return flagObjectTransfer(); 
+        return flagObjectTransfer();
 #endif
-	}
-	else
-	{
-		return ((LLViewerObject*)getParent())->permTransfer();
-	}
+    }
+    else
+    {
+        return ((LLViewerObject*)getParent())->permTransfer();
+    }
 }
 
 // Can only open objects that you own, or that someone has
 // given you modify rights to.  JC
 BOOL LLViewerObject::allowOpen() const
 {
-	return !flagInventoryEmpty() && (permYouOwner() || permModify());
+    return !flagInventoryEmpty() && (permYouOwner() || permModify());
 }
 
 LLViewerObject::LLInventoryCallbackInfo::~LLInventoryCallbackInfo()
 {
-	if (mListener)
-	{
-		mListener->clearVOInventoryListener();
-	}
+    if (mListener)
+    {
+        mListener->clearVOInventoryListener();
+    }
 }
 
 void LLViewerObject::updateVolume(const LLVolumeParams& volume_params)
 {
-	if (setVolume(volume_params, 1)) // *FIX: magic number, ack!
-	{
-		// Transmit the update to the simulator
-		sendShapeUpdate();
-		markForUpdate();
-	}
+    if (setVolume(volume_params, 1)) // *FIX: magic number, ack!
+    {
+        // Transmit the update to the simulator
+        sendShapeUpdate();
+        markForUpdate();
+    }
 }
 
 void LLViewerObject::recursiveMarkForUpdate()
@@ -6725,259 +6725,259 @@ void LLViewerObject::recursiveMarkForUpdate()
 
 void LLViewerObject::markForUpdate()
 {
-	if (mDrawable.notNull())
-	{
-		gPipeline.markTextured(mDrawable);
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY);
-	}
+    if (mDrawable.notNull())
+    {
+        gPipeline.markTextured(mDrawable);
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_GEOMETRY);
+    }
 }
 
 bool LLViewerObject::isPermanentEnforced() const
 {
-	return flagObjectPermanent() && (mRegionp != gAgent.getRegion()) && !gAgent.isGodlike();
+    return flagObjectPermanent() && (mRegionp != gAgent.getRegion()) && !gAgent.isGodlike();
 }
 
 bool LLViewerObject::getIncludeInSearch() const
 {
-	return flagIncludeInSearch();
+    return flagIncludeInSearch();
 }
 
 void LLViewerObject::setIncludeInSearch(bool include_in_search)
 {
-	setFlags(FLAGS_INCLUDE_IN_SEARCH, include_in_search);
+    setFlags(FLAGS_INCLUDE_IN_SEARCH, include_in_search);
 }
 
 void LLViewerObject::setRegion(LLViewerRegion *regionp)
 {
-	if (!regionp)
-	{
-		LL_WARNS() << "viewer object set region to NULL" << LL_ENDL;
-	}
-	if(regionp != mRegionp)
-	{
-		if(mRegionp)
-		{
-			mRegionp->removeFromCreatedList(getLocalID()); 
-		}
-		if(regionp)
-		{
-			regionp->addToCreatedList(getLocalID()); 
-		}
-	}
-	
-	mLatestRecvPacketID = 0;
-	mRegionp = regionp;
-
-	for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
-	{
-		LLViewerObject* child = *i;
-		child->setRegion(regionp);
-	}
+    if (!regionp)
+    {
+        LL_WARNS() << "viewer object set region to NULL" << LL_ENDL;
+    }
+    if(regionp != mRegionp)
+    {
+        if(mRegionp)
+        {
+            mRegionp->removeFromCreatedList(getLocalID());
+        }
+        if(regionp)
+        {
+            regionp->addToCreatedList(getLocalID());
+        }
+    }
+
+    mLatestRecvPacketID = 0;
+    mRegionp = regionp;
+
+    for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
+    {
+        LLViewerObject* child = *i;
+        child->setRegion(regionp);
+    }
 
     if (mControlAvatar)
     {
         mControlAvatar->setRegion(regionp);
     }
 
-	setChanged(MOVED | SILHOUETTE);
-	updateDrawable(FALSE);
+    setChanged(MOVED | SILHOUETTE);
+    updateDrawable(FALSE);
 }
 
 // virtual
-void	LLViewerObject::updateRegion(LLViewerRegion *regionp)
+void    LLViewerObject::updateRegion(LLViewerRegion *regionp)
 {
-//	if (regionp)
-//	{
-//		F64 now = LLFrameTimer::getElapsedSeconds();
-//		LL_INFOS() << "Updating to region " << regionp->getName()
-//			<< ", ms since last update message: " << (F32)((now - mLastMessageUpdateSecs) * 1000.0)
-//			<< ", ms since last interpolation: " << (F32)((now - mLastInterpUpdateSecs) * 1000.0) 
-//			<< LL_ENDL;
-//	}
+//  if (regionp)
+//  {
+//      F64 now = LLFrameTimer::getElapsedSeconds();
+//      LL_INFOS() << "Updating to region " << regionp->getName()
+//          << ", ms since last update message: " << (F32)((now - mLastMessageUpdateSecs) * 1000.0)
+//          << ", ms since last interpolation: " << (F32)((now - mLastInterpUpdateSecs) * 1000.0)
+//          << LL_ENDL;
+//  }
 }
 
 
 bool LLViewerObject::specialHoverCursor() const
 {
-	return flagUsePhysics()
-			|| flagHandleTouch()
-			|| (mClickAction != 0);
+    return flagUsePhysics()
+            || flagHandleTouch()
+            || (mClickAction != 0);
 }
 
 void LLViewerObject::updateFlags(BOOL physics_changed)
 {
-	LLViewerRegion* regionp = getRegion();
-	if(!regionp) return;
-	gMessageSystem->newMessage("ObjectFlagUpdate");
-	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, getLocalID() );
-	gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, flagUsePhysics() );
-	gMessageSystem->addBOOL("IsTemporary", flagTemporaryOnRez() );
-	gMessageSystem->addBOOL("IsPhantom", flagPhantom() );
-
-	// stinson 02/28/2012 : This CastsShadows BOOL is no longer used in either the viewer or the simulator
-	// The simulator code does not even unpack this value when the message is received.
-	// This could be potentially hijacked in the future for another use should the urgent need arise.
-	gMessageSystem->addBOOL("CastsShadows", FALSE );
-
-	if (physics_changed)
-	{
-		gMessageSystem->nextBlock("ExtraPhysics");
-		gMessageSystem->addU8("PhysicsShapeType", getPhysicsShapeType() );
-		gMessageSystem->addF32("Density", getPhysicsDensity() );
-		gMessageSystem->addF32("Friction", getPhysicsFriction() );
-		gMessageSystem->addF32("Restitution", getPhysicsRestitution() );
-		gMessageSystem->addF32("GravityMultiplier", getPhysicsGravity() );
-	}
-	gMessageSystem->sendReliable( regionp->getHost() );
+    LLViewerRegion* regionp = getRegion();
+    if(!regionp) return;
+    gMessageSystem->newMessage("ObjectFlagUpdate");
+    gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+    gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+    gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+    gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, getLocalID() );
+    gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, flagUsePhysics() );
+    gMessageSystem->addBOOL("IsTemporary", flagTemporaryOnRez() );
+    gMessageSystem->addBOOL("IsPhantom", flagPhantom() );
+
+    // stinson 02/28/2012 : This CastsShadows BOOL is no longer used in either the viewer or the simulator
+    // The simulator code does not even unpack this value when the message is received.
+    // This could be potentially hijacked in the future for another use should the urgent need arise.
+    gMessageSystem->addBOOL("CastsShadows", FALSE );
+
+    if (physics_changed)
+    {
+        gMessageSystem->nextBlock("ExtraPhysics");
+        gMessageSystem->addU8("PhysicsShapeType", getPhysicsShapeType() );
+        gMessageSystem->addF32("Density", getPhysicsDensity() );
+        gMessageSystem->addF32("Friction", getPhysicsFriction() );
+        gMessageSystem->addF32("Restitution", getPhysicsRestitution() );
+        gMessageSystem->addF32("GravityMultiplier", getPhysicsGravity() );
+    }
+    gMessageSystem->sendReliable( regionp->getHost() );
 }
 
 BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
 {
-	BOOL setit = setFlagsWithoutUpdate(flags, state);
+    BOOL setit = setFlagsWithoutUpdate(flags, state);
 
-	// BUG: Sometimes viewer physics and simulator physics get
-	// out of sync.  To fix this, always send update to simulator.
-// 	if (setit)
-	{
-		updateFlags();
-	}
-	return setit;
+    // BUG: Sometimes viewer physics and simulator physics get
+    // out of sync.  To fix this, always send update to simulator.
+//  if (setit)
+    {
+        updateFlags();
+    }
+    return setit;
 }
 
 BOOL LLViewerObject::setFlagsWithoutUpdate(U32 flags, BOOL state)
 {
-	BOOL setit = FALSE;
-	if (state)
-	{
-		if ((mFlags & flags) != flags)
-		{
-			mFlags |= flags;
-			setit = TRUE;
-		}
-	}
-	else
-	{
-		if ((mFlags & flags) != 0)
-		{
-			mFlags &= ~flags;
-			setit = TRUE;
-		}
-	}
-	return setit;
+    BOOL setit = FALSE;
+    if (state)
+    {
+        if ((mFlags & flags) != flags)
+        {
+            mFlags |= flags;
+            setit = TRUE;
+        }
+    }
+    else
+    {
+        if ((mFlags & flags) != 0)
+        {
+            mFlags &= ~flags;
+            setit = TRUE;
+        }
+    }
+    return setit;
 }
 
 void LLViewerObject::setPhysicsShapeType(U8 type)
 {
-	mPhysicsShapeUnknown = false;
-	if (type != mPhysicsShapeType)
-	{
-	mPhysicsShapeType = type;
-	setObjectCostStale();
+    mPhysicsShapeUnknown = false;
+    if (type != mPhysicsShapeType)
+    {
+    mPhysicsShapeType = type;
+    setObjectCostStale();
 }
 }
 
 void LLViewerObject::setPhysicsGravity(F32 gravity)
 {
-	mPhysicsGravity = gravity;
+    mPhysicsGravity = gravity;
 }
 
 void LLViewerObject::setPhysicsFriction(F32 friction)
 {
-	mPhysicsFriction = friction;
+    mPhysicsFriction = friction;
 }
 
 void LLViewerObject::setPhysicsDensity(F32 density)
 {
-	mPhysicsDensity = density;
+    mPhysicsDensity = density;
 }
 
 void LLViewerObject::setPhysicsRestitution(F32 restitution)
 {
-	mPhysicsRestitution = restitution;
+    mPhysicsRestitution = restitution;
 }
 
 U8 LLViewerObject::getPhysicsShapeType() const
-{ 
-	if (mPhysicsShapeUnknown)
-	{
-		gObjectList.updatePhysicsFlags(this);
-	}
+{
+    if (mPhysicsShapeUnknown)
+    {
+        gObjectList.updatePhysicsFlags(this);
+    }
 
-	return mPhysicsShapeType; 
+    return mPhysicsShapeType;
 }
 
 void LLViewerObject::applyAngularVelocity(F32 dt)
 {
-	//do target omega here
-	mRotTime += dt;
-	LLVector3 ang_vel = getAngularVelocity();
-	F32 omega = ang_vel.magVecSquared();
-	F32 angle = 0.0f;
-	LLQuaternion dQ;
-	if (omega > 0.00001f)
-	{
-		omega = sqrt(omega);
-		angle = omega * dt;
-
-		ang_vel *= 1.f/omega;
-		
-		// calculate the delta increment based on the object's angular velocity
-		dQ.setQuat(angle, ang_vel);
-
-		// accumulate the angular velocity rotations to re-apply in the case of an object update
-		mAngularVelocityRot *= dQ;
-		
-		// Just apply the delta increment to the current rotation
-		setRotation(getRotation()*dQ);
-		setChanged(MOVED | SILHOUETTE);
-	}
+    //do target omega here
+    mRotTime += dt;
+    LLVector3 ang_vel = getAngularVelocity();
+    F32 omega = ang_vel.magVecSquared();
+    F32 angle = 0.0f;
+    LLQuaternion dQ;
+    if (omega > 0.00001f)
+    {
+        omega = sqrt(omega);
+        angle = omega * dt;
+
+        ang_vel *= 1.f/omega;
+
+        // calculate the delta increment based on the object's angular velocity
+        dQ.setQuat(angle, ang_vel);
+
+        // accumulate the angular velocity rotations to re-apply in the case of an object update
+        mAngularVelocityRot *= dQ;
+
+        // Just apply the delta increment to the current rotation
+        setRotation(getRotation()*dQ);
+        setChanged(MOVED | SILHOUETTE);
+    }
 }
 
 void LLViewerObject::resetRotTime()
 {
-	mRotTime = 0.0f;
+    mRotTime = 0.0f;
 }
 
 void LLViewerObject::resetRot()
 {
-	resetRotTime();
+    resetRotTime();
 
-	// Reset the accumulated angular velocity rotation
-	mAngularVelocityRot.loadIdentity(); 
+    // Reset the accumulated angular velocity rotation
+    mAngularVelocityRot.loadIdentity();
 }
 
 U32 LLViewerObject::getPartitionType() const
-{ 
-	return LLViewerRegion::PARTITION_NONE; 
+{
+    return LLViewerRegion::PARTITION_NONE;
 }
 
 void LLViewerObject::dirtySpatialGroup() const
 {
-	if (mDrawable)
-	{
-		LLSpatialGroup* group = mDrawable->getSpatialGroup();
-		if (group)
-		{
-			group->dirtyGeom();
-			gPipeline.markRebuild(group);
-		}
-	}
+    if (mDrawable)
+    {
+        LLSpatialGroup* group = mDrawable->getSpatialGroup();
+        if (group)
+        {
+            group->dirtyGeom();
+            gPipeline.markRebuild(group);
+        }
+    }
 }
 
 void LLViewerObject::dirtyMesh()
 {
-	if (mDrawable)
-	{
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
-	}
+    if (mDrawable)
+    {
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
+    }
 }
 
 F32 LLAlphaObject::getPartSize(S32 idx)
 {
-	return 0.f;
+    return 0.f;
 }
 
 void LLAlphaObject::getBlendFunc(S32 face, LLRender::eBlendFactor& src, LLRender::eBlendFactor& dst)
@@ -6988,235 +6988,235 @@ void LLAlphaObject::getBlendFunc(S32 face, LLRender::eBlendFactor& src, LLRender
 // virtual
 void LLStaticViewerObject::updateDrawable(BOOL force_damped)
 {
-	// Force an immediate rebuild on any update
-	if (mDrawable.notNull())
-	{
-		mDrawable->updateXform(TRUE);
-		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
-	}
-	clearChanged(SHIFTED);
+    // Force an immediate rebuild on any update
+    if (mDrawable.notNull())
+    {
+        mDrawable->updateXform(TRUE);
+        gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
+    }
+    clearChanged(SHIFTED);
 }
 
 void LLViewerObject::saveUnselectedChildrenPosition(std::vector<LLVector3>& positions)
 {
-	if(mChildList.empty() || !positions.empty())
-	{
-		return ;
-	}
+    if(mChildList.empty() || !positions.empty())
+    {
+        return ;
+    }
 
-	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
-			iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* childp = *iter;
-		if (!childp->isSelected() && childp->mDrawable.notNull())
-		{
-			positions.push_back(childp->getPositionEdit());		
-		}
-	}
+    for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+            iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* childp = *iter;
+        if (!childp->isSelected() && childp->mDrawable.notNull())
+        {
+            positions.push_back(childp->getPositionEdit());
+        }
+    }
 
-	return ;
+    return ;
 }
 
 void LLViewerObject::saveUnselectedChildrenRotation(std::vector<LLQuaternion>& rotations)
 {
-	if(mChildList.empty())
-	{
-		return ;
-	}
+    if(mChildList.empty())
+    {
+        return ;
+    }
 
-	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
-			iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* childp = *iter;
-		if (!childp->isSelected() && childp->mDrawable.notNull())
-		{
-			rotations.push_back(childp->getRotationEdit());				
-		}		
-	}
+    for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+            iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* childp = *iter;
+        if (!childp->isSelected() && childp->mDrawable.notNull())
+        {
+            rotations.push_back(childp->getRotationEdit());
+        }
+    }
 
-	return ;
+    return ;
 }
 
 //counter-rotation
-void LLViewerObject::resetChildrenRotationAndPosition(const std::vector<LLQuaternion>& rotations, 
-											const std::vector<LLVector3>& positions)
-{
-	if(mChildList.empty())
-	{
-		return ;
-	}
-
-	S32 index = 0 ;
-	LLQuaternion inv_rotation = ~getRotationEdit() ;
-	LLVector3 offset = getPositionEdit() ;
-	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
-			iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* childp = *iter;
-		if (!childp->isSelected() && childp->mDrawable.notNull())
-		{
-			if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
-			{
-				childp->setRotation(rotations[index] * inv_rotation);
-				childp->setPosition((positions[index] - offset) * inv_rotation);
-				LLManip::rebuild(childp);					
-			}
-			else //avatar
-			{
-				LLVector3 reset_pos = (positions[index] - offset) * inv_rotation ;
-				LLQuaternion reset_rot = rotations[index] * inv_rotation ;
-
-				((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);				
-				((LLVOAvatar*)childp)->mDrawable->mXform.setRotation(reset_rot) ;
-				
-				((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos, TRUE);				
-				((LLVOAvatar*)childp)->mDrawable->getVObj()->setRotation(reset_rot, TRUE) ;
-
-				LLManip::rebuild(childp);				
-			}	
-			index++;
-		}				
-	}
-
-	return ;
+void LLViewerObject::resetChildrenRotationAndPosition(const std::vector<LLQuaternion>& rotations,
+                                            const std::vector<LLVector3>& positions)
+{
+    if(mChildList.empty())
+    {
+        return ;
+    }
+
+    S32 index = 0 ;
+    LLQuaternion inv_rotation = ~getRotationEdit() ;
+    LLVector3 offset = getPositionEdit() ;
+    for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+            iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* childp = *iter;
+        if (!childp->isSelected() && childp->mDrawable.notNull())
+        {
+            if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+            {
+                childp->setRotation(rotations[index] * inv_rotation);
+                childp->setPosition((positions[index] - offset) * inv_rotation);
+                LLManip::rebuild(childp);
+            }
+            else //avatar
+            {
+                LLVector3 reset_pos = (positions[index] - offset) * inv_rotation ;
+                LLQuaternion reset_rot = rotations[index] * inv_rotation ;
+
+                ((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);
+                ((LLVOAvatar*)childp)->mDrawable->mXform.setRotation(reset_rot) ;
+
+                ((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos, TRUE);
+                ((LLVOAvatar*)childp)->mDrawable->getVObj()->setRotation(reset_rot, TRUE) ;
+
+                LLManip::rebuild(childp);
+            }
+            index++;
+        }
+    }
+
+    return ;
 }
 
 //counter-translation
 void LLViewerObject::resetChildrenPosition(const LLVector3& offset, BOOL simplified, BOOL skip_avatar_child)
 {
-	if(mChildList.empty())
-	{
-		return ;
-	}
-
-	LLVector3 child_offset;
-	if(simplified) //translation only, rotation matrix does not change
-	{
-		child_offset = offset * ~getRotation();
-	}
-	else //rotation matrix might change too.
-	{
-		if (isAttachment() && mDrawable.notNull())
-		{
-			LLXform* attachment_point_xform = mDrawable->getXform()->getParent();
-			LLQuaternion parent_rotation = getRotation() * attachment_point_xform->getWorldRotation();
-			child_offset = offset * ~parent_rotation;
-		}
-		else
-		{
-			child_offset = offset * ~getRenderRotation();
-		}
-	}
-
-	for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
-			iter != mChildList.end(); iter++)
-	{
-		LLViewerObject* childp = *iter;
-
-		if (!childp->isSelected() && childp->mDrawable.notNull())
-		{
-			if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
-			{
-				childp->setPosition(childp->getPosition() + child_offset);
-				LLManip::rebuild(childp);
-			}
-			else //avatar
-			{
-				if(!skip_avatar_child)
-				{
-					LLVector3 reset_pos = ((LLVOAvatar*)childp)->mDrawable->mXform.getPosition() + child_offset ;
-
-					((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);
-					((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos);
-					LLManip::rebuild(childp);
-				}
-			}
-		}
-	}
-
-	return ;
-}
-
-// virtual 
-BOOL	LLViewerObject::isTempAttachment() const
-{
-	return (mID.notNull() && (mID == mAttachmentItemID));
+    if(mChildList.empty())
+    {
+        return ;
+    }
+
+    LLVector3 child_offset;
+    if(simplified) //translation only, rotation matrix does not change
+    {
+        child_offset = offset * ~getRotation();
+    }
+    else //rotation matrix might change too.
+    {
+        if (isAttachment() && mDrawable.notNull())
+        {
+            LLXform* attachment_point_xform = mDrawable->getXform()->getParent();
+            LLQuaternion parent_rotation = getRotation() * attachment_point_xform->getWorldRotation();
+            child_offset = offset * ~parent_rotation;
+        }
+        else
+        {
+            child_offset = offset * ~getRenderRotation();
+        }
+    }
+
+    for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+            iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* childp = *iter;
+
+        if (!childp->isSelected() && childp->mDrawable.notNull())
+        {
+            if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+            {
+                childp->setPosition(childp->getPosition() + child_offset);
+                LLManip::rebuild(childp);
+            }
+            else //avatar
+            {
+                if(!skip_avatar_child)
+                {
+                    LLVector3 reset_pos = ((LLVOAvatar*)childp)->mDrawable->mXform.getPosition() + child_offset ;
+
+                    ((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);
+                    ((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos);
+                    LLManip::rebuild(childp);
+                }
+            }
+        }
+    }
+
+    return ;
+}
+
+// virtual
+BOOL    LLViewerObject::isTempAttachment() const
+{
+    return (mID.notNull() && (mID == mAttachmentItemID));
 }
 
 BOOL LLViewerObject::isHiglightedOrBeacon() const
 {
-	if (LLFloaterReg::instanceVisible("beacons") && (gPipeline.getRenderBeacons() || gPipeline.getRenderHighlights()))
-	{
-		BOOL has_media = (getMediaType() == LLViewerObject::MEDIA_SET);
-		BOOL is_scripted = !isAvatar() && !getParent() && flagScripted();
-		BOOL is_physical = !isAvatar() && flagUsePhysics();
-
-		return (isParticleSource() && gPipeline.getRenderParticleBeacons())
-				|| (isAudioSource() && gPipeline.getRenderSoundBeacons())
-				|| (has_media && gPipeline.getRenderMOAPBeacons())
-				|| (is_scripted && gPipeline.getRenderScriptedBeacons())
-				|| (is_scripted && flagHandleTouch() && gPipeline.getRenderScriptedTouchBeacons())
-				|| (is_physical && gPipeline.getRenderPhysicalBeacons());
-	}
-	return FALSE;
+    if (LLFloaterReg::instanceVisible("beacons") && (gPipeline.getRenderBeacons() || gPipeline.getRenderHighlights()))
+    {
+        BOOL has_media = (getMediaType() == LLViewerObject::MEDIA_SET);
+        BOOL is_scripted = !isAvatar() && !getParent() && flagScripted();
+        BOOL is_physical = !isAvatar() && flagUsePhysics();
+
+        return (isParticleSource() && gPipeline.getRenderParticleBeacons())
+                || (isAudioSource() && gPipeline.getRenderSoundBeacons())
+                || (has_media && gPipeline.getRenderMOAPBeacons())
+                || (is_scripted && gPipeline.getRenderScriptedBeacons())
+                || (is_scripted && flagHandleTouch() && gPipeline.getRenderScriptedTouchBeacons())
+                || (is_physical && gPipeline.getRenderPhysicalBeacons());
+    }
+    return FALSE;
 }
 
 
 const LLUUID &LLViewerObject::getAttachmentItemID() const
 {
-	return mAttachmentItemID;
+    return mAttachmentItemID;
 }
 
 void LLViewerObject::setAttachmentItemID(const LLUUID &id)
 {
-	mAttachmentItemID = id;
+    mAttachmentItemID = id;
 }
 
 EObjectUpdateType LLViewerObject::getLastUpdateType() const
 {
-	return mLastUpdateType;
+    return mLastUpdateType;
 }
 
 void LLViewerObject::setLastUpdateType(EObjectUpdateType last_update_type)
 {
-	mLastUpdateType = last_update_type;
+    mLastUpdateType = last_update_type;
 }
 
 BOOL LLViewerObject::getLastUpdateCached() const
 {
-	return mLastUpdateCached;
+    return mLastUpdateCached;
 }
 
 void LLViewerObject::setLastUpdateCached(BOOL last_update_cached)
 {
-	mLastUpdateCached = last_update_cached;
+    mLastUpdateCached = last_update_cached;
 }
 
 const LLUUID &LLViewerObject::extractAttachmentItemID()
 {
-	LLUUID item_id = LLUUID::null;
-	LLNameValue* item_id_nv = getNVPair("AttachItemID");
-	if( item_id_nv )
-	{
-		const char* s = item_id_nv->getString();
-		if( s )
-		{
-			item_id.set(s);
-		}
-	}
-	setAttachmentItemID(item_id);
-	return getAttachmentItemID();
+    LLUUID item_id = LLUUID::null;
+    LLNameValue* item_id_nv = getNVPair("AttachItemID");
+    if( item_id_nv )
+    {
+        const char* s = item_id_nv->getString();
+        if( s )
+        {
+            item_id.set(s);
+        }
+    }
+    setAttachmentItemID(item_id);
+    return getAttachmentItemID();
 }
 
 const std::string& LLViewerObject::getAttachmentItemName() const
 {
-	static std::string empty;
-	LLInventoryItem *item = gInventory.getItem(getAttachmentItemID());
-	if (isAttachment() && item)
-	{
-		return item->getName();
-	}
-	return empty;
+    static std::string empty;
+    LLInventoryItem *item = gInventory.getItem(getAttachmentItemID());
+    if (isAttachment() && item)
+    {
+        return item->getName();
+    }
+    return empty;
 }
 
 //virtual
@@ -7226,19 +7226,19 @@ LLVOAvatar* LLViewerObject::getAvatar() const
     {
         return getControlAvatar();
     }
-	if (isAttachment())
-	{
-		LLViewerObject* vobj = (LLViewerObject*) getParent();
+    if (isAttachment())
+    {
+        LLViewerObject* vobj = (LLViewerObject*) getParent();
 
-		while (vobj && !vobj->asAvatar())
-		{
-			vobj = (LLViewerObject*) vobj->getParent();
-		}
+        while (vobj && !vobj->asAvatar())
+        {
+            vobj = (LLViewerObject*) vobj->getParent();
+        }
 
-		return (LLVOAvatar*) vobj;
-	}
+        return (LLVOAvatar*) vobj;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 bool LLViewerObject::hasRenderMaterialParams() const
@@ -7318,12 +7318,12 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
     {
         new_material = gGLTFMaterialList.getMaterial(id);
     }
-        
+
     // update local state
     for (S32 te = start_idx; te < end_idx; ++te)
     {
         LLTextureEntry* tep = getTE(te);
-        
+
         // If local_origin=false (i.e. it's from the server), we know the
         // material has updated or been created, because extra params are
         // checked for equality on unpacking. In that case, checking the
@@ -7332,7 +7332,7 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
         bool material_changed = !local_origin || !param_block || id != param_block->getMaterial(te);
 
         if (update_server)
-        { 
+        {
             // Clear most overrides so the render material better matches the material
             // ID (preserve transforms). If overrides become passthrough, set the overrides
             // to nullptr.
@@ -7343,7 +7343,7 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
         }
 
         if (update_server || material_changed)
-        { 
+        {
             tep->setGLTFRenderMaterial(nullptr);
         }
 
@@ -7460,53 +7460,53 @@ void LLViewerObject::shrinkWrap()
 class ObjectPhysicsProperties : public LLHTTPNode
 {
 public:
-	virtual void post(
-		ResponsePtr responder,
-		const LLSD& context,
-		const LLSD& input) const
-	{
-		LLSD object_data = input["body"]["ObjectData"];
-		S32 num_entries = object_data.size();
-		
-		for ( S32 i = 0; i < num_entries; i++ )
-		{
-			LLSD& curr_object_data = object_data[i];
-			U32 local_id = curr_object_data["LocalID"].asInteger();
-
-			// Iterate through nodes at end, since it can be on both the regular AND hover list
-			struct f : public LLSelectedNodeFunctor
-			{
-				U32 mID;
-				f(const U32& id) : mID(id) {}
-				virtual bool apply(LLSelectNode* node)
-				{
-					return (node->getObject() && node->getObject()->mLocalID == mID );
-				}
-			} func(local_id);
-
-			LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(&func);
-
-			if (node)
-			{
-				// The LLSD message builder doesn't know how to handle U8, so we need to send as S8 and cast
-				U8 type = (U8)curr_object_data["PhysicsShapeType"].asInteger();
-				F32 density = (F32)curr_object_data["Density"].asReal();
-				F32 friction = (F32)curr_object_data["Friction"].asReal();
-				F32 restitution = (F32)curr_object_data["Restitution"].asReal();
-				F32 gravity = (F32)curr_object_data["GravityMultiplier"].asReal();
-
-				node->getObject()->setPhysicsShapeType(type);
-				node->getObject()->setPhysicsGravity(gravity);
-				node->getObject()->setPhysicsFriction(friction);
-				node->getObject()->setPhysicsDensity(density);
-				node->getObject()->setPhysicsRestitution(restitution);
-			}	
-		}
-		
-		dialog_refresh_all();
-	};
+    virtual void post(
+        ResponsePtr responder,
+        const LLSD& context,
+        const LLSD& input) const
+    {
+        LLSD object_data = input["body"]["ObjectData"];
+        S32 num_entries = object_data.size();
+
+        for ( S32 i = 0; i < num_entries; i++ )
+        {
+            LLSD& curr_object_data = object_data[i];
+            U32 local_id = curr_object_data["LocalID"].asInteger();
+
+            // Iterate through nodes at end, since it can be on both the regular AND hover list
+            struct f : public LLSelectedNodeFunctor
+            {
+                U32 mID;
+                f(const U32& id) : mID(id) {}
+                virtual bool apply(LLSelectNode* node)
+                {
+                    return (node->getObject() && node->getObject()->mLocalID == mID );
+                }
+            } func(local_id);
+
+            LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(&func);
+
+            if (node)
+            {
+                // The LLSD message builder doesn't know how to handle U8, so we need to send as S8 and cast
+                U8 type = (U8)curr_object_data["PhysicsShapeType"].asInteger();
+                F32 density = (F32)curr_object_data["Density"].asReal();
+                F32 friction = (F32)curr_object_data["Friction"].asReal();
+                F32 restitution = (F32)curr_object_data["Restitution"].asReal();
+                F32 gravity = (F32)curr_object_data["GravityMultiplier"].asReal();
+
+                node->getObject()->setPhysicsShapeType(type);
+                node->getObject()->setPhysicsGravity(gravity);
+                node->getObject()->setPhysicsFriction(friction);
+                node->getObject()->setPhysicsDensity(density);
+                node->getObject()->setPhysicsRestitution(restitution);
+            }
+        }
+
+        dialog_refresh_all();
+    };
 };
 
 LLHTTPRegistration<ObjectPhysicsProperties>
-	gHTTPRegistrationObjectPhysicsProperties("/message/ObjectPhysicsProperties");
+    gHTTPRegistrationObjectPhysicsProperties("/message/ObjectPhysicsProperties");