Merge branch 'weekly-next' into weekly

13 files changed, 121 insertions, 25 deletions

diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index f5f9c03..9c5e9f7 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,12 +1,22 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-  # Maybe libxml and glib should have their own .cmake files
+if (STANDALONE)
+  include(FindPkgConfig)
+
+  pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
+  pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
+  pkg_check_modules(GSTREAMER_VIDEO REQUIRED gstreamer-video-0.10)
+
+else (STANDALONE)
+
+  # libxml and glib should have their own .cmake files
   use_prebuilt_binary(libxml)
   use_prebuilt_binary(glib)
 
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+  set(GSTREAMER_VIDEO_FOUND ON FORCE BOOL)
 
   use_prebuilt_binary(gstreamer)
   use_prebuilt_binary(gstreamer-plugins)
@@ -105,9 +115,11 @@ else (WINDOWS)
 
 endif (WINDOWS)
 
-if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
+endif (STANDALONE)
+
+if (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND AND GSTREAMER_VIDEO_FOUND)
   set(GSTREAMER ON CACHE BOOL "Build with GStreamer streaming media support.")
-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND)
+endif (GSTREAMER_FOUND AND GSTREAMER_PLUGINS_BASE_FOUND AND GSTREAMER_VIDEO_FOUND)
 
 if (GSTREAMER)
   add_definitions(-DLL_GSTREAMER_ENABLED=1)
diff --git a/linden/indra/cmake/LLMedia.cmake b/linden/indra/cmake/LLMedia.cmake
index 8a36a69..e7769db 100644
--- a/linden/indra/cmake/LLMedia.cmake
+++ b/linden/indra/cmake/LLMedia.cmake
@@ -10,4 +10,5 @@ set(LLMEDIA_LIBRARIES
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
+    ${GSTREAMER_VIDEO_LIBRARIES}
     )
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 4f0e0cc..b9efd57 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -2,11 +2,21 @@
 
 include(Variables)
 include(Linking)
+include(FindPkgConfig)
 
 set(OPENAL ON CACHE BOOL "Enable OpenAL")
 
+# If STANDALONE but NOT PKG_CONFIG_FOUND we should fail,
+# but why try to find it as prebuilt?
+if (OPENAL AND STANDALONE AND PKG_CONFIG_FOUND)
 
-if (OPENAL)
+  # This module defines
+  # OPENAL_INCLUDE_DIRS
+  # OPENAL_LIBRARIES
+  # OPENAL_FOUND
+  pkg_check_modules(OPENAL REQUIRED freealut)   # freealut links with openal.
+
+elseif (OPENAL)
 
   # message(STATUS "Building with OpenAL audio support")
 
@@ -110,4 +120,4 @@ if (OPENAL)
     "Found OpenAL and ALUT libraries successfully"
     )
 
-endif (OPENAL)
+endif (OPENAL AND STANDALONE AND PKG_CONFIG_FOUND)
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index c7b5cd1..f3c8e30 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -15,6 +15,7 @@ include(Mozlib)
 include_directories(
     ${GSTREAMER_INCLUDE_DIRS}
     ${GSTREAMER_PLUGINS_BASE_INCLUDE_DIRS}
+    ${GSTREAMER_VIDEO_INCLUDE_DIRS}
     ${LLAUDIO_INCLUDE_DIRS}
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLIMAGE_INCLUDE_DIRS}
@@ -75,5 +76,6 @@ target_link_libraries(
     llmedia
     ${GSTREAMER_LIBRARIES}
     ${GSTREAMER_PLUGINS_BASE_LIBRARIES}
+    ${GSTREAMER_VIDEO_LIBRARIES}
     ${QUICKTIME_LIBRARY}
     )
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index aeb5c0b..b38bf9a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6683,7 +6683,7 @@
     <key>Comment</key>
     <string>Double resolution of snapshot from current window resolution</string>
     <key>Persist</key>
-    <integer>1</integer>
+    <integer>0</integer>
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2496d13..96fc451 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1189,6 +1189,9 @@ bool LLAppViewer::cleanup()
         {                                       //*might* crash imprudence TODO: fix the voiceclient instead
                 //this deletes all your buddies
                 LLAvatarTracker::instance().reset();
+                // reset group data. Blame LL for the need to clear a member variable through a global
+                LLGroupMgr::getInstance()->clearGroups();
+                gAgent.mGroups.clear();
         }
 
         //reset balance for not playing the UI-Sound 
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 83abcf4..1634950 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -64,6 +64,7 @@
 #include "llinventorymodel.h"
 #include "llmenugl.h"
 #include "llmutelist.h"
+#include "llparcel.h" // RezWithLandGroup
 #include "llstatusbar.h"
 #include "llsurface.h"
 #include "lltool.h"
@@ -77,6 +78,7 @@
 #include "llviewermenu.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
+#include "llviewerparcelmgr.h" // RezWithLandGroup
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llvoavatar.h"
@@ -3135,7 +3137,20 @@ void LLSelectMgr::packDuplicateOnRayHead(void *user_data)
         msg->nextBlockFast(_PREHASH_AgentData);
         msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
         msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID() );
-        msg->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID() );
+        LLUUID group_id = gAgent.getGroupID();
+        if (gSavedSettings.getBOOL("RezWithLandGroup"))
+        {
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                if (gAgent.isInGroup(parcel->getGroupID()))
+                {
+                        group_id = parcel->getGroupID();
+                }
+                else if (gAgent.isInGroup(parcel->getOwnerID()))
+                {
+                        group_id = parcel->getOwnerID();
+                }
+        }
+        msg->addUUIDFast(_PREHASH_GroupID, group_id);
         msg->addVector3Fast(_PREHASH_RayStart, data->mRayStartRegion );
         msg->addVector3Fast(_PREHASH_RayEnd, data->mRayEndRegion );
         msg->addBOOLFast(_PREHASH_BypassRaycast, data->mBypassRaycast );
@@ -3907,6 +3922,18 @@ void LLSelectMgr::packAgentAndSessionAndGroupID(void* user_data)
 void LLSelectMgr::packDuplicateHeader(void* data)
 {
         LLUUID group_id(gAgent.getGroupID());
+        if (gSavedSettings.getBOOL("RezWithLandGroup"))
+        {
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                if (gAgent.isInGroup(parcel->getGroupID()))
+                {
+                        group_id = parcel->getGroupID();
+                }
+                else if (gAgent.isInGroup(parcel->getOwnerID()))
+                {
+                        group_id = parcel->getOwnerID();
+                }
+        }
         packAgentAndSessionAndGroupID(&group_id);
 
         LLDuplicateData* dup_data = (LLDuplicateData*) data;
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index d5c4de1..00b0c9f 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -67,6 +67,7 @@
 
 #include "llparcel.h" // RezWithLandGroup
 #include "llviewerparcelmgr.h" // RezWithLandGroup
+#include "roles_constants.h" // Ele: Land Group Override
 
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
@@ -264,9 +265,11 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
         // RezWithLandGroup 2009-05, If avatar is in land group/land owner group,
         // it rezzes it with it to prevent autoreturn/whatever
-        if ( gSavedSettings.getBOOL("RezWithLandGroup") )
+
+        // Ele: if agent is in land group and has create powers but the tag is not active, force it to enable build seamlessly
+        LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if ( gSavedSettings.getBOOL("RezWithLandGroup"))
         {
-                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 if ( gAgent.isInGroup(parcel->getGroupID()) )
                 {
                         gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
@@ -280,7 +283,11 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
                         gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
                 }
         }
-        else 
+        else if (gAgent.hasPowerInGroup(parcel->getGroupID(), GP_LAND_ALLOW_CREATE) && !parcel->getIsGroupOwned())
+        {
+                gMessageSystem->addUUIDFast(_PREHASH_GroupID, parcel->getGroupID());
+        }
+        else
         {
                 gMessageSystem->addUUIDFast(_PREHASH_GroupID, gAgent.getGroupID());
         }
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 364dcfd..432fcc5 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -43,6 +43,7 @@
 #include "llfloaternamedesc.h"
 #include "llfloatersnapshot.h"
 #include "llinventorymodel.h"   // gInventory
+#include "llinventoryview.h"    // open_texture()
 #include "llresourcedata.h"
 #include "llfloaterperms.h"
 #include "llstatusbar.h"
@@ -875,7 +876,9 @@ void temp_upload_done_callback(const LLUUID& uuid, void* user_data, S32 result,
                 item->updateServer(TRUE);
                 gInventory.updateItem(item);
                 gInventory.notifyObservers();
-        }else //        if(result >= 0)
+                open_texture(item_id, std::string("Texture: ") + item->getName(), TRUE, LLUUID::null, FALSE);
+        }
+        else // if(result >= 0)
         {
                 LLSD args;
                 args["FILE"] = LLInventoryType::lookupHumanReadable(data->mInventoryType);
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 61b91fe..257ce0d 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -651,15 +651,21 @@ BOOL LLViewerParcelMgr::agentCanBuild() const
 {
         if (mAgentParcel)
         {
-                return (gAgent.isGodlike()
-                                || (mAgentParcel->allowModifyBy(
-                                                gAgent.getID(),
-                                                gAgent.getGroupID())));
-        }
-        else
-        {
-                return gAgent.isGodlike();
+                const LLUUID parcel_group = mAgentParcel->getGroupID();
+                const LLUUID active_group = gAgent.getGroupID();
+
+                if (gAgent.isGodlike())
+                        return true;
+
+                if (mAgentParcel->allowModifyBy(gAgent.getID(), active_group))
+                        return true;
+
+                // Ele: enable build option if we are in the land group and we have create powers, even if the group tag is not active
+                if (gAgent.isInGroup(parcel_group) && gAgent.hasPowerInGroup(parcel_group, GP_LAND_ALLOW_CREATE))
+                        return true;
         }
+
+        return gAgent.isGodlike();
 }
 
 BOOL LLViewerParcelMgr::agentCanTakeDamage() const
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 63043f0..adbc4de 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -350,6 +350,34 @@ void primbackup::pre_export_object()
 bool primbackup::check_perms( LLSelectNode* node )
 {
         LLPermissions *perms = node->mPermissions;
+        // We check to see if there are megaprims in SL we can export. 
+        // Cludgy, but the only option considering LL's TPV policy.
+        if (gHippoGridManager->getConnectedGrid()->isSecondLife())
+        {
+                bool is_sl_megaprim = false;
+                for (int i = 0; i < 3; ++i)
+                {
+                        if (node->getObject()->getScale().mV[i] > 10)
+                        {
+                                is_sl_megaprim = true;
+                                break;
+                        }
+                }
+
+                if (is_sl_megaprim)
+                {
+                        // The following avatars in Second Life have given Imprudence permission for their full-perm
+                        // megaprims to be exported even if that means changing the creator from themselves:
+                        // McCabe_Maxsted ("3fc0478f-1c40-48a1-b8a7-3b7062efeda1");
+                        // Gene_Replacement ("adfacb56-390b-4fdc-9216-3494f1c59862");
+                        return ((perms->getCreator() == LLUUID("3fc0478f-1c40-48a1-b8a7-3b7062efeda1") ||
+                                        perms->getCreator() == LLUUID("adfacb56-390b-4fdc-9216-3494f1c59862") ||
+                                        perms->getCreator() == gAgent.getID()) &&
+                                        perms->getOwner() == gAgent.getID() &&
+                                        (PERM_ITEM_UNRESTRICTED & perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
+                }
+        }
+
         return (gAgent.getID() == perms->getOwner() &&
                 gAgent.getID() == perms->getCreator() &&
                 (PERM_ITEM_UNRESTRICTED &
@@ -1111,7 +1139,4 @@ void primbackup::upload_next_asset()
                  "Uploaded texture",
                  NULL,
                  NULL);
-
-
 }
-
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 8dfd43c..e02abe2 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <floater name="minimap" short_title="Mini-Map"
-         height="455" width="200" min_height="400" min_width="240"
+         height="455" width="200" min_height="325" min_width="200"
          follows="top|right" can_close="true" can_drag_on_left="false"
          can_minimize="true" can_resize="true" can_tear_off="false"
                rect_control="FloaterMiniMapRect">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 3b039de..db4d1e1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -136,10 +136,10 @@
         </combo_box>
 
         <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
-             increment="32" label="Width" label_width="30" left="10" max_val="6016"
+             increment="32" label="Width" label_width="30" left="10" max_val="4096"
              min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
         <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
-             increment="32" label="Height" label_width="35" left="110" max_val="6016"
+             increment="32" label="Height" label_width="35" left="110" max_val="4096"
              min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
         <check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
              name="keep_aspect_check" />