Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.

1 files changed, 14 insertions, 2 deletions

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index ad44356..adf82cd 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1942,7 +1942,11 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
         
 {
         if (!mbCanSelect ||
-                (gHideSelectedObjects && isSelected()) ||
+//              (gHideSelectedObjects && isSelected()) ||
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                ( (gHideSelectedObjects && isSelected()) && 
+                  ((!rlv_handler_t::isEnabled()) || (!isHUDAttachment()) || (gRlvHandler.isDetachable(this))) ) ||
+// [/RLVa:KB]
                         mDrawable->isDead() || 
                         !gPipeline.hasRenderType(mDrawable->getRenderType()))
         {
@@ -2084,10 +2088,18 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 
-        if (facep->getViewerObject()->isSelected() && gHideSelectedObjects)
+//      if (facep->getViewerObject()->isSelected() && gHideSelectedObjects)
+//      {
+//              return;
+//      }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        LLViewerObject* pObj = facep->getViewerObject();
+        if ( (pObj->isSelected() && gHideSelectedObjects) && 
+                 ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) )
         {
                 return;
         }
+// [/RVLa:KB]
 
         //add face to drawmap
         LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[type];