4 files changed, 36 insertions, 3 deletions

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/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);