Merged SL 1.23.5 into Imprudence.

Conflicts:
	linden/indra/cmake/CopyWinLibs.cmake
	linden/indra/lib/python/indra/util/llversion.py
	linden/indra/llcommon/llversionviewer.h
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/llassetuploadresponders.cpp
	linden/indra/newview/llpreview.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/viewer_manifest.py

5 files changed, 105 insertions, 8 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2e08087..12d052c 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7895,7 +7895,7 @@
     <key>Type</key>
     <string>S32</string>
     <key>Value</key>
-    <integer>4096</integer>
+    <integer>8192</integer>
   </map>
     <key>RenderMaxVBOSize</key>
     <map>
diff --git a/linden/indra/newview/build_win32_appConfig.py b/linden/indra/newview/build_win32_appConfig.py
new file mode 100644
index 0000000..fb6a025
--- /dev/null
+++ b/linden/indra/newview/build_win32_appConfig.py
@@ -0,0 +1,58 @@
+# @file build_win32_appConfig.py
+# @brief Create the windows app.config file to redirect crt linkage.
+#
+# $LicenseInfo:firstyear=2009&license=viewergpl$
+# 
+# Copyright (c) 2009, Linden Research, Inc.
+# 
+# Second Life Viewer Source Code
+# The source code in this file ("Source Code") is provided by Linden Lab
+# to you under the terms of the GNU General Public License, version 2.0
+# ("GPL"), unless you have obtained a separate licensing agreement
+# ("Other License"), formally executed by you and Linden Lab.  Terms of
+# the GPL can be found in doc/GPL-license.txt in this distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+# 
+# There are special exceptions to the terms and conditions of the GPL as
+# it is applied to this Source Code. View the full text of the exception
+# in the file doc/FLOSS-exception.txt in this software distribution, or
+# online at
+# http://secondlifegrid.net/programs/open_source/licensing/flossexception
+# 
+# By copying, modifying or distributing this software, you acknowledge
+# that you have read and understood your obligations described above,
+# and agree to abide by those obligations.
+# 
+# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+# COMPLETENESS OR PERFORMANCE.
+# $/LicenseInfo$
+
+import sys, os, re
+from xml.dom.minidom import parse
+
+def main():
+    src_manifest_name = sys.argv[1]
+    src_config_name = sys.argv[2]
+    dst_config_name = sys.argv[3]
+ 
+    manifest_dom = parse(src_manifest_name)
+    node = manifest_dom.getElementsByTagName('assemblyIdentity')[0]
+    manifest_assm_ver = node.getAttribute('version')
+    
+    config_dom = parse(src_config_name)
+    node = config_dom.getElementsByTagName('bindingRedirect')[0]
+    node.setAttribute('newVersion', manifest_assm_ver)
+    src_old_ver = re.match('([^-]*-).*', node.getAttribute('oldVersion')).group(1)
+    node.setAttribute('oldVersion', src_old_ver + manifest_assm_ver)
+    comment = config_dom.createComment("This file is automatically generated by the build. see indra/newview/build_win32_appConfig.py")
+    config_dom.insertBefore(comment, config_dom.childNodes[0])
+    
+    f = open(dst_config_name, 'w')
+    config_dom.writexml(f)
+    f.close()
+        
+    return 0
+
+if __name__ == "__main__":
+    main()
diff --git a/linden/indra/newview/llfloaterbulkpermission.cpp b/linden/indra/newview/llfloaterbulkpermission.cpp
index d4e1e98..6721661 100644
--- a/linden/indra/newview/llfloaterbulkpermission.cpp
+++ b/linden/indra/newview/llfloaterbulkpermission.cpp
@@ -281,6 +281,35 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, Invent
                                 LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
                                 LLViewerInventoryItem* new_item = (LLViewerInventoryItem*)item;
                                 LLPermissions perm(new_item->getPermissions());
+                                U32 flags = new_item->getFlags();
+
+                                U32 desired_next_owner_perms = LLFloaterPerms::getNextOwnerPerms("BulkChange");
+                                U32 desired_everyone_perms = LLFloaterPerms::getEveryonePerms("BulkChange");
+                                U32 desired_group_perms = LLFloaterPerms::getGroupPerms("BulkChange");
+
+                                // If next owner permissions have changed (and this is an object)
+                                // then set the slam permissions flag so that they are applied on rez.
+                                if((perm.getMaskNextOwner() != desired_next_owner_perms)
+                                   && (new_item->getType() == LLAssetType::AT_OBJECT))
+                                {
+                                        flags |= LLInventoryItem::II_FLAGS_OBJECT_SLAM_PERM;
+                                }
+                                // If everyone permissions have changed (and this is an object)
+                                // then set the overwrite everyone permissions flag so they
+                                // are applied on rez.
+                                if ((perm.getMaskEveryone() != desired_everyone_perms)
+                                    && (new_item->getType() == LLAssetType::AT_OBJECT))
+                                {
+                                        flags |= LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE;
+                                }
+                                // If group permissions have changed (and this is an object)
+                                // then set the overwrite group permissions flag so they
+                                // are applied on rez.
+                                if ((perm.getMaskGroup() != desired_group_perms)
+                                    && (new_item->getType() == LLAssetType::AT_OBJECT))
+                                {
+                                        flags |= LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
+                                }
 
                                 // chomp the inventory name so it fits in the scroll window nicely
                                 // and the user can see the [OK]
@@ -303,10 +332,11 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, Invent
                                         //|| something else // for next owner perms
                                         )
                                 {
-                                        perm.setMaskNext(LLFloaterPerms::getNextOwnerPerms("BulkChange"));
-                                        perm.setMaskEveryone(LLFloaterPerms::getEveryonePerms("BulkChange"));
-                                        perm.setMaskGroup(LLFloaterPerms::getGroupPerms("BulkChange"));
+                                        perm.setMaskNext(desired_next_owner_perms);
+                                        perm.setMaskEveryone(desired_everyone_perms);
+                                        perm.setMaskGroup(desired_group_perms);
                                         new_item->setPermissions(perm); // here's the beef
+                                        new_item->setFlags(flags); // and the tofu
                                         updateInventory(object,new_item,TASK_INVENTORY_ITEM_KEY,FALSE);
                                         //status_text.setArg("[STATUS]", getString("status_ok_text"));
                                         status_text.setArg("[STATUS]", "");
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 9961003..6e7c6e3 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -620,7 +620,6 @@ void LLPreview::setAssetId(const LLUUID& asset_id)
                 LLViewerObject* object = gObjectList.findObject(mObjectUUID);
                 if(NULL == object)
                 {
-                        llwarns << "LLPreview::setAssetId() called on unrecognized object, UUID : " << mObjectUUID << llendl;
                         return;
                 }
                 object->updateViewerInventoryAsset(item, asset_id);
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 39df657..35957a5 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -235,6 +235,18 @@ class WindowsManifest(ViewerManifest):
                 self.path("Microsoft.VC80.CRT.manifest")
             self.end_prefix()
 
+        # The config file name needs to match the exe's name.
+        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
+
+        # We need this one too, so that llkdu loads at runtime - DEV-41194
+        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config")
+
+        # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004
+        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config")
+
+        # same thing for auto-updater.
+        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst="updater.exe.config")
+
         # Mozilla runtime DLLs (CP)
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
             self.path("freebl3.dll")
@@ -263,9 +275,6 @@ class WindowsManifest(ViewerManifest):
 
         # Mozilla hack to get it to accept newer versions of msvc*80.dll than are listed in manifest
         # necessary as llmozlib2-vc80.lib refers to an old version of msvc*80.dll - can be removed when new version of llmozlib is built - Nyx
-        # The config file name needs to match the exe's name.
-        self.path("SecondLife.exe.config", dst=self.final_exe() + ".config")
-
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
         #    self.path("alut.dll")
@@ -802,6 +811,7 @@ class Linux_i686Manifest(LinuxManifest):
         super(Linux_i686Manifest, self).construct()
         self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 #        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
+
         self.path("linux_tools/launch_url.sh","launch_url.sh")
         if self.prefix("res-sdl"):
             self.path("*")