Merged in jacek/next

1 files changed, 16 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index ca7055a..102b135 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -1006,6 +1006,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         coloru.mV[3] = 255 - coloru.mV[3];
                                         mText->setColor(LLColor4(coloru));
                                         mText->setStringUTF8(temp_string);
+// [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                                        if (rlv_handler_t::isEnabled())
+                                        {
+                                                mText->setObjectText(temp_string);
+                                        }
+// [/RLVa:KB]
                                         
                                         if (mDrawable.notNull())
                                         {
@@ -1423,6 +1429,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         coloru.mV[3] = 255 - coloru.mV[3];
                                         mText->setColor(LLColor4(coloru));
                                         mText->setStringUTF8(temp_string);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                                        if (rlv_handler_t::isEnabled())
+                                        {
+                                                mText->setObjectText(temp_string);
+                                        }
+// [/RLVa:KB]
 
                                         setChanged(TEXTURE);
                                 }
@@ -4795,7 +4807,10 @@ BOOL LLViewerObject::permTransfer() const
 // given you modify rights to.  JC
 BOOL LLViewerObject::allowOpen() const
 {
-        return !flagInventoryEmpty() && (permYouOwner() || permModify());
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+        return !flagInventoryEmpty() && (permYouOwner() || permModify()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_EDIT));
+// [/RLVa:KB]
+//      return !flagInventoryEmpty() && (permYouOwner() || permModify());
 }
 
 LLViewerObject::LLInventoryCallbackInfo::~LLInventoryCallbackInfo()