Removed RLVa temporarily from First Use

3 files changed, 0 insertions, 58 deletions

diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index e504547..bea9260 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -292,36 +292,3 @@ void LLFirstUse::useMedia()
                 LLNotifications::instance().add("FirstMedia");
         }
 }
-
-// [RLVa:KB] - Version: 1.22.11 | Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
-
-// SL-1.22.11 doesn't seem to have a way to check which notifications are currently open :(
-bool rlvHasVisibleFirstUseNotification()
-{
-        return false;
-}
-
-void LLFirstUse::showRlvFirstUseNotification(const std::string& strName)
-{
-        if ( (gSavedSettings.getWarning(strName)) && (!rlvHasVisibleFirstUseNotification()) )
-        {
-                gSavedSettings.setWarning(strName, FALSE);
-                LLNotifyBox::showXml(strName);
-        }
-}
-
-void LLFirstUse::warnRlvGiveToRLV()
-{
-        if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
-                gViewerWindow->alertXml(RLV_SETTING_FIRSTUSE_GIVETORLV, LLStringUtil::format_map_t(), &LLFirstUse::onRlvGiveToRLVConfirmation, NULL);
-}
-
-void LLFirstUse::onRlvGiveToRLVConfirmation(S32 idxOption, void* /*pUserParam*/)
-{
-        gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE);
-
-        if ( (0 == idxOption) || (1 == idxOption) )
-                gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1));
-}
-
-// [/RLVa:KB]
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 54b4730..a6fc5ed 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1909,14 +1909,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
                         else
                         {
-// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-09-10 (RLVa-1.0.3a)
-                                if ( (rlv_handler_t::isEnabled()) && (dialog == IM_TASK_INVENTORY_OFFERED) &&
-                                         (info->mDesc.find(RLV_PUTINV_PREFIX) == 1) && (gRlvHandler.getSharedRoot()) )
-                                {
-                                        LLFirstUse::warnRlvGiveToRLV();
-                                }
-// [/RLVa:KB]
-
                                 inventory_offer_handler(info, dialog == IM_TASK_INVENTORY_OFFERED);
                         }
                 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index a0ea083..1921311 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -919,23 +919,6 @@ You can find example sculpted textures in the inventory library.
                         You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
                 </message>
         </notify>
-  <!-- [RLVa:KB] -->
-  <notify name="FirstRLVDetach" tip="false">
-    <message name="message">
-One of your attachments was made nondetachable using Restrained Life.
-Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
-
-For more information search for &apos;Restrained Life&apos; on the SL wiki.
-    </message>
-  </notify>
-  <notify name="FirstRLVFartouch" tip="false">
-    <message name="message">
-You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
-
-Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
-    </message>
-  </notify>
-  <!-- [/RLVa:KB] -->
   <notify name="MaxListSelectMessage" tip="true">
                 <message name="message">
                         You may only select up to [MAX_SELECT] items