Merge remote branch 'mccabe/1.2.0-next' into next

16 files changed, 248 insertions, 58 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5110fd5..30ab5fb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,42 @@
+2009-09-25 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Removed problematic /MP flag.
+        
+                modified:   linden/indra/cmake/00-Common.cmake
+                
+                
+        * Fixed Windows using wrong GStreamer library names.
+        
+                modified:   linden/indra/cmake/GStreamer.cmake
+                
+        
+        * Fixed region names not showing up on regions with zero avatars.
+        
+                modified:   linden/indra/newview/llworldmapview.cpp
+                
+
+2009-09-24 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied RLVa patch for Imprudence 1.2 by Kitty Barnett.
+        
+                modified:   linden/indra/newview/llfloatermap.cpp
+                modified:   linden/indra/newview/llinventorybridge.cpp
+                modified:   linden/indra/newview/llnetmap.cpp
+                modified:   linden/indra/newview/llpanelpermissions.cpp
+                modified:   linden/indra/newview/llwindlightremotectrl.cpp
+
+                
+        * Fixed Add button being enabled for friends in the radar.
+        
+                modified:   linden/indra/newview/llfloatermap.cpp
+                
+                
+        * Fixed Last Owner text in tools window not disabling.
+        
+                modified:   linden/indra/newview/llpanelpermissions.cpp
+                modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
 2009-09-23  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Moved "Show HUD Attachments" back to View, restored shortcut.
@@ -6,6 +45,25 @@
           modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 
 
+2009-09-22 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed RLVa issue in LLNetMap the right way (thanks Kitty).
+        
+                modified:   linden/indra/newview/llnetmap.cpp
+                
+                
+        * Clarifed Mini-Map menu option: 'Show Map' to 'Show World Map'.
+        
+                modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+                
+                
+        * Applied particle chat feature from Emerald viewer (tell an object it's selected on channel 9000).
+        
+                modified:   linden/indra/newview/app_settings/settings.xml
+                modified:   linden/indra/newview/llvoavatar.cpp
+                modified:   linden/indra/newview/llvoavatar.h
+                
+
 2009-09-21 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Changed 'Presets' button to 'Sky'.
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 27838d6..2d691ad 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -31,9 +31,15 @@ if (WINDOWS)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
       "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
-  set(CMAKE_CXX_FLAGS_RELEASE
+  if (MSVC80)
+      set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /MT"
+      CACHE STRING "C++ compiler release options" FORCE)
+  else (MSVC80)
+      set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT"
       CACHE STRING "C++ compiler release options" FORCE)
+  endif (MSVC80)
 
   add_definitions(
       /DLL_WINDOWS=1
@@ -57,21 +63,6 @@ if (WINDOWS)
       /Zc:wchar_t-
       )
   endif (MSVC80 OR MSVC90)
-
-  # VS optimization flags
-  if(MSVC80)
-
-    set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
-
-    set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
-      CACHE STRING "C++ compiler release options" FORCE)
-
-  add_definitions(
-      /MP${NUMBER_OF_CORES}
-      )
-
-  endif (MSVC80)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 29896d0..8bfad11 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -29,23 +29,23 @@ if (WINDOWS)
       gmodule-2.0
       gobject-2.0
       gthread-2.0
-      libgstvideo-0.10
-      libgsttag-0.10
-      libgstsdp-0.10
-      libgstrtsp-0.10
-      libgstrtp-0.10
-      libgstriff-0.10
-      libgstreamer-0.10
-      libgstpbutils-0.10
-      libgstnetbuffer-0.10
-      libgstnet-0.10
-      libgstinterfaces-0.10
-      libgstdshow-0.10
-      libgstdataprotocol-0.10
-      libgstcontroller-0.10
-      libgstbase-0.10
-      libgstaudio-0.10
-      libgstapp-0.10
+      libgstvideo.lib
+      libgsttag.lib
+      libgstsdp.lib
+      libgstrtsp.lib
+      libgstrtp.lib
+      libgstriff.lib
+      libgstreamer-0.10.lib
+      libgstpbutils.lib
+      libgstnetbuffer.lib
+      libgstnet-0.10.lib
+      libgstinterfaces.lib
+      libgstdshow.lib
+      libgstdataprotocol-0.10.lib
+      libgstcontroller-0.10.lib
+      libgstbase-0.10.lib
+      libgstaudio.lib
+      libgstapp.lib
       libxml2
       libxml2_a
       libxml2_a_dll
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 207a48b..85837ba 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -536,7 +536,7 @@ class WindowsSetup(PlatformSetup):
         gen = gen.lower()
         try:
             import _winreg
-            key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s\Setup\VC' %
+            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
                        self.gens[gen]['ver'])
             value_str = (r'ProductDir')
             print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 194e95e..087c92f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5559,6 +5559,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ParticleChat</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Chat target of effect beam to channel 9000</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>Boolean</string>
+                        <key>Value</key>
+                        <integer>1</integer>
+    </map>
     <key>PerAccountSettingsFile</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 3be891e..6d23ab4 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -240,6 +240,13 @@ void LLFloaterMap::populateRadar()
                 std::string fullname = getSelectedName(avatar_ids[i]);
                 if (!fullname.empty())
                 {
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                fullname = gRlvHandler.getAnonym(fullname);
+                        }
+// [/RLVa:KB]
+
                         std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
                         element["id"] = avatar_ids[i];
                         element["columns"][0]["column"] = "avatar_name";
@@ -290,12 +297,14 @@ void LLFloaterMap::toggleButtons()
         BOOL enable_unmute = FALSE;
         BOOL enable_track = FALSE;
         BOOL enable_estate = FALSE;
+        BOOL enable_friend = FALSE;
         if (childHasFocus("RadarPanel"))
         {
                 enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
                 enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
                 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
                 enable_estate = getKickable(mSelectedAvatar);
+                enable_friend = !is_agent_friend(mSelectedAvatar);
         }
         else
         {
@@ -314,6 +323,33 @@ void LLFloaterMap::toggleButtons()
         childSetEnabled("unmute_btn", enable_unmute);
         childSetEnabled("ar_btn", enable);
         childSetEnabled("estate_eject_btn", enable_estate);
+
+// [RLVa:KB] - Imprudence-1.2.0
+        // Bit clumsy, but this way the RLV stuff is in its own separate block and keeps the code above clean - Kitty
+        if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
+        {
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        childSetEnabled("im_btn", FALSE);
+                        childSetEnabled("profile_btn", FALSE);
+                        childSetEnabled("invite_btn", FALSE);
+                        childSetEnabled("add_btn", FALSE);
+                        childSetEnabled("mute_btn", FALSE);
+                        childSetEnabled("unmute_btn", FALSE);
+                }
+
+                // Even though the avie is in the same sim (so they already know where we are) the tp would just get blocked by different code
+                // so it's actually less confusing to the user if we just disable the teleport button here so they'll at least have a visual cue
+                BOOL rlv_enable_tp = (!gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) || (gRlvHandler.isException(RLV_BHVR_TPLURE, mSelectedAvatar));
+                if ( (rlv_enable_tp) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+                {
+                        const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(mSelectedAvatar);
+                        if ( ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
+                                rlv_enable_tp = FALSE;
+                }
+                childSetEnabled("offer_teleport_btn", rlv_enable_tp);
+        }
+// [/RLVa:KB]
 }
 
 BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 19a5ade..618c4f9 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -4241,7 +4241,15 @@ void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove)
                 {
                         if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) )
                         {
-                                items.put(item);
+//                              items.put(item);
+// [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+                                LLViewerJointAttachment* pAttachPt = NULL;
+                                if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || 
+                                         (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt->getObject()))) )
+                                {
+                                        items.put(item);
+                                }
+// [/RLVa:KB]
                         }
                         else if ( (item->isComplete()) )
                         {
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 9ef56c1..e848aeb 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -379,8 +379,8 @@ void LLNetMap::draw()
                                 }
                         }
 
-// [RLVa:KB]
-                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
                         {
                                 // User is not allowed to see who it is, or even if it's a friend,
                                 // due to RLV settings.
@@ -604,22 +604,15 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 std::string fullname;
                 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
                 {
-// [RLVa:KB]
-                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
-                        {
-                                // User is not allowed to see who it is, due to RLV settings.
-                                msg.append(rlv_handler_t::cstrHidden);
-                        }
-                        else
-                        {
-                                msg.append(fullname);
-                                msg.append("\n");
-                        }
-// [/RLVa:KB]
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        // User is not allowed to see who it is, due to RLV settings.
+                        msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : gRlvHandler.getAnonym(fullname) );
+                        msg.append("\n");
+ // [/RLVa:KB]
                 }
                 
-// [RLVa:KB]
-                if (rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC) )
                 {
                         // User is not allowed to see where they are, due to RLV settings.
                         msg.append( rlv_handler_t::cstrHidden ); 
@@ -1028,6 +1021,13 @@ bool LLNetMap::LLEnableTracking::handleEvent(LLPointer<LLEvent> event, const LLS
 
 bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+        {
+                return true;
+        }
+// [/RLVa:KB]
+
         LLNetMap *self = mPtr;
         LLFloaterAvatarInfo::show(self->mClosestAgentAtLastRightClick);
         return true;
@@ -1036,6 +1036,9 @@ bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const L
 bool LLNetMap::LLEnableProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         LLNetMap *self = mPtr;
-        self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
+        //self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
         return true;
 }
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 24bbab6..42cb88c 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -348,14 +348,19 @@ void LLPanelPermissions::refresh()
                 fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
 // [/RLVa:KB]
 
-        if (owner_name != last_owner_name)
+        //if (owner_name != last_owner_name)
+// [RLVa:KB]
+        if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
+// [/RLVa:KB]
         {
+                childSetEnabled("Last Owner:", TRUE);
                 childSetText("Last Owner Name", last_owner_name);
                 childSetEnabled("Last Owner Name", TRUE);
                 childSetEnabled("button last owner profile", TRUE);
         }
         else
         {
+                childSetEnabled("Last Owner:", FALSE);
                 childSetText("Last Owner Name", LLStringUtil::null);
                 childSetEnabled("Last Owner Name", FALSE);
                 childSetEnabled("button last owner profile", FALSE);
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 24272d8..431ef96 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -295,6 +295,9 @@ F32 LLVOAvatar::sUnbakedTime = 0.f;
 F32 LLVOAvatar::sUnbakedUpdateTime = 0.f;
 F32 LLVOAvatar::sGreyTime = 0.f;
 F32 LLVOAvatar::sGreyUpdateTime = 0.f;
+LLVector3d LLVOAvatar::sBeamLastAt;
+int LLVOAvatar::sPartsNow;
+
 
 struct LLAvatarTexData
 {
@@ -3445,6 +3448,26 @@ void LLVOAvatar::idleUpdateTractorBeam()
         if (!needsRenderBeam() || !mIsBuilt)
         {
                 mBeam = NULL;
+                if(gSavedSettings.getBOOL("ParticleChat"))
+                {
+                        if(sPartsNow != FALSE)
+                        {
+                                sPartsNow = FALSE;
+                                LLMessageSystem* msg = gMessageSystem;
+                                msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                msg->nextBlockFast(_PREHASH_AgentData);
+                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                msg->nextBlockFast(_PREHASH_ChatData);
+                                msg->addStringFast(_PREHASH_Message, "stop");
+                                msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                msg->addS32("Channel", 9000);
+                                
+                                gAgent.sendReliableMessage();
+                                sBeamLastAt  =  LLVector3d::zero;
+                                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+                        }
+                }
         }
         else if (!mBeam || mBeam->isDead())
         {
@@ -3463,6 +3486,48 @@ void LLVOAvatar::idleUpdateTractorBeam()
                 {
                         // get point from pointat effect
                         mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal());
+
+                        if(gSavedSettings.getBOOL("ParticleChat"))
+                        {
+                                if(sPartsNow != TRUE)
+                                {
+                                        sPartsNow = TRUE;
+                                        LLMessageSystem* msg = gMessageSystem;
+                                        msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                        msg->nextBlockFast(_PREHASH_AgentData);
+                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                        msg->nextBlockFast(_PREHASH_ChatData);
+                                        msg->addStringFast(_PREHASH_Message, "start");
+                                        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                        msg->addS32("Channel", 9000);
+                                        
+                                        gAgent.sendReliableMessage();
+
+                                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+                                }
+                                //LLVector3d a = sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal();
+                                //if(a.length > 2)
+                                if( (sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal()).length() > .2)
+                                //if(sBeamLastAt!=gAgent.mPointAt->getPointAtPosGlobal())
+                                {
+                                        sBeamLastAt = gAgent.mPointAt->getPointAtPosGlobal(); 
+
+                                        LLMessageSystem* msg = gMessageSystem;
+                                        msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                        msg->nextBlockFast(_PREHASH_AgentData);
+                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                        msg->nextBlockFast(_PREHASH_ChatData);
+                                        msg->addStringFast(_PREHASH_Message, llformat("<%.6f, %.6f, %.6f>",(F32)(sBeamLastAt.mdV[VX]),(F32)(sBeamLastAt.mdV[VY]),(F32)(sBeamLastAt.mdV[VZ])));
+                                        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                        msg->addS32("Channel", 9000); // *TODO: make configurable
+                                        
+                                        gAgent.sendReliableMessage();
+                                }
+
+                        }
+
                         mBeam->triggerLocal();
                 }
                 else if (selection->getFirstRootObject() && 
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 9806ceb..8607383 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -918,6 +918,9 @@ public:
         static F32              sGreyTime; // Total seconds with >=1 grey avatars
         static F32              sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame) 
         
+        static int              sPartsNow;
+        static LLVector3d sBeamLastAt;
+
         //--------------------------------------------------------------------
         // Texture Layer Sets and Global Colors
         //--------------------------------------------------------------------  
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 591b413..510e1df 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -41,6 +41,9 @@
 #include "llwlparammanager.h"
 #include "llviewercontrol.h"
 
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 class LLWindlightRemoteObserver : public LLWLPresetsObserver
 {
@@ -85,6 +88,14 @@ void LLWindlightRemoteCtrl::draw()
                 }
         }
 
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        if (rlv_handler_t::isEnabled())
+        {
+                childSetEnabled("Environment", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+                mPresetsCombo->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+        }
+// [/RLVA:KB]
+
         LLPanel::draw();
 }
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 947bdfd..485a895 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -682,9 +682,8 @@ void LLWorldMapView::draw()
                                                 LLFontGL::LEFT,
                                                 LLFontGL::BASELINE,
                                                 LLFontGL::DROP_SHADOW);
-
-                                        mesg = info->mName;
                                 }
+                                mesg = info->mName;
                         }
                         else
                         {
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3485812..54f7775 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -51,7 +51,7 @@
              tool_tip="Offer this friend a teleport to your current location" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Track"
              left_delta="0" name="track_btn"
-             tool_tip="Create a beacon to track this avatar" width="80" />
+             tool_tip="Create a beacon to track friends you can map" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
              left_delta="0" name="invite_btn"
              tool_tip="Remove this person from your friends list" width="80" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index a57c568..00f3f3e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -389,7 +389,7 @@
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="LastOwner:" v_pad="0" width="78">
+                             mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
         Last Owner:
       </text>
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 0172b41..d1f5fc8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -25,7 +25,7 @@
     <on_check function="MiniMap.CheckRotate" userdata="" />
   </menu_item_check>
   <menu_item_separator />
-  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"
+  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show World Map"
                  left="0" mouse_opaque="true" name="Show Map" width="128">
     <on_click function="MiniMap.ShowWorldMap" userdata="" />
   </menu_item_call>