55 files changed, 1283 insertions, 163 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 032a3cf..0e90073 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -186,8 +186,8 @@ if (DARWIN)
  add_definitions(-DLL_DARWIN=1)
  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch -msse3 -msse4.1 -msse4.2 -mssse3 -w")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch -msse3 -msse4.1 -msse4.2 -mssse3 -w")
  # NOTE: it's critical that the optimization flag is put in front.
  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index 0901c1b..e4257f4 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -9,10 +9,12 @@ if (WINDOWS)
    NAMES python25.exe python23.exe python.exe
    NO_DEFAULT_PATH # added so that cmake does not find cygwin python
    PATHS
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 5d4dffe..8a06133 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -60,17 +60,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  # set this dynamically from the build system now -
  # NOTE: wont have a distributable build unless you add this on the configure line with:
  # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  #set(CMAKE_OSX_ARCHITECTURES i386;ppc)
+  set(CMAKE_OSX_ARCHITECTURES i386)
-  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-    set(ARCH universal)
+    set(ARCH i386)
-  else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH ppc)
-    else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH i386)
-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
  set(LL_ARCH ${ARCH}_darwin)
  set(LL_ARCH_DIR universal-darwin)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 809ac78..2ce9f91 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -421,7 +421,7 @@ class DarwinSetup(UnixSetup):
            type=self.build_type.upper()
            )
        if self.unattended == 'ON':
-            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386\''
        #if simple:
        #    return 'cmake %(opts)s %(dir)r' % args
        return ('cmake -G %(generator)r '
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 7db62bc..3c6cd43 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -870,6 +870,7 @@ void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
                }
                string.assign(t, size);
+                delete[] t;
        }
 }
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 2bc62fb..fd8d128 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -73,7 +73,13 @@ typedef enum e_image_codec
        IMG_CODEC_JPEG = 5,
        IMG_CODEC_DXT  = 6,
        IMG_CODEC_PNG  = 7,
+#ifdef LL_DARWIN
+        IMG_CODEC_PSD = 8,
+        IMG_CODEC_TIFF = 9,
+        IMG_CODEC_EOF  = 10
+#else
        IMG_CODEC_EOF  = 8
+#endif
 } EImageCodec;
 //============================================================================
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index 9792a91..c5923cd 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -442,7 +442,15 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
                std::string font_path = local_path + *file_name_it;
                BOOL is_fallback = !is_first_found;
                F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult());
-                F32 size = (F32)llround(point_size * size_mult);
+                if (gSavedSettings.getF32("FontSizeMultiplier") > 0)
+                {
+                        size_mult *= gSavedSettings.getF32("FontSizeMultiplier");
+                }
+                F32 size = (F32)(point_size * size_mult);
+                if (gSavedSettings.getBOOL("FontSizeRounding"))
+                {
+                        size = (F32)llround(size);
+                }
                if (!fontp->loadFace(font_path, size,
                                                         LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
                {
diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp
index 2459110..4d3ff46 100644
--- a/linden/indra/llui/llnotifications.cpp
+++ b/linden/indra/llui/llnotifications.cpp
@@ -1190,13 +1190,13 @@ void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements)
                        if (found != replacements.end())
                        {
                                replacement = found->second;
-                                //llwarns << "replaceSubstituionStrings: value: " << value << " repl: " << replacement << llendl;
+                                //llinfos << "replaceSubstitutionStrings: value: \"" << value << "\" repl: \"" << replacement << "\"." << llendl;
                                it->second->setValue(replacement);
                        }
                        else
                        {
-                                llwarns << "replaceSubstituionStrings FAILURE: value: " << value << " repl: " << replacement << llendl;
+                                llwarns << "replaceSubstitutionStrings FAILURE: could not find replacement \"" << value << "\"." << llendl;
                        }
                }
        }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 6d5dcf3..b2d9787 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                if (error == noErr)
                {
                        FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL);
                }
                
                // mOSUserAppDir
diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index 7df2a81..9bf5b59 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -583,8 +583,9 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename
                }
        }
-        LL_WARNS("VFS") << "Using index file " << mIndexFilename << LL_ENDL;
+        // Success!
-        LL_WARNS("VFS") << "Using data file " << mDataFilename << LL_ENDL;
+        LL_INFOS("VFS") << "Using index file " << mIndexFilename << LL_ENDL;
+        LL_INFOS("VFS") << "Using data file " << mDataFilename << LL_ENDL;
        mValid = VFSVALID_OK;
 }
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index 5f33764..abe8c5d 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -58,29 +58,44 @@ BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image)
        UInt8* bitmap = (UInt8*)CFDataGetBytePtr(result);
        CGImageAlphaInfo format = CGImageGetAlphaInfo(image_ref);
-        if (format & kCGImageAlphaPremultipliedFirst)
+        if (format != kCGImageAlphaNone)
        {
                vImage_Buffer vb;
                vb.data = bitmap;
                vb.height = height;
                vb.width = width;
                vb.rowBytes = bytes_per_row;
-                llinfos << "Unpremultiplying ARGB888" << llendl;
-                vImageUnpremultiplyData_ARGB8888(&vb, &vb, 0);
+                if (format & kCGImageAlphaPremultipliedFirst)
-        }
+                {
-        else if (format & kCGImageAlphaPremultipliedLast)
+                        // Ele: ARGB -> BGRA on Intel, need to first reorder the bytes, then unpremultiply as RGBA :)
-        {
+                        llinfos << "Unpremultiplying BGRA8888" << llendl;
-                vImage_Buffer vb;
-                vb.data = bitmap;
+                        for (int i=0; i<height; i++)
-                vb.height = height;
+                        {
-                vb.width = width;
+                                for (int j=0; j<bytes_per_row; j+=4)
-                vb.rowBytes = bytes_per_row;
+                                {
-                llinfos << "Unpremultiplying RGBA888" << llendl;
+                                        unsigned char tmp[4];
-                vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                                        tmp[0] = bitmap[j*height+3];
+                                        tmp[1] = bitmap[j*height+2];
+                                        tmp[2] = bitmap[j*height+1];
+                                        tmp[3] = bitmap[j*height];
+                                        memcpy(&bitmap[j*height], &tmp, 4);
+                                }
+                        }
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
+                else if (format & kCGImageAlphaPremultipliedLast)
+                {
+                        llinfos << "Unpremultiplying RGBA8888" << llendl;
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
        }
        raw_image->resize(width, height, comps);
-        llinfos << "Decoding an image of width: " << width << " and height: " << height << " and components: " << comps << llendl;
        memcpy(raw_image->getData(), bitmap, height * bytes_per_row);
        raw_image->verticalFlip();
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index 68daa50..cc56119 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -484,8 +484,9 @@ void LLScriptLibrary::init()
        // documented and therefore the description may be incomplete and require further attention.
        // OpenSimulator is written in C# and not CPP therefore some values for example "double = float" etc. are different.
-        // OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (February 19, 2010)
+        // OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010 
-        // based on OpenSimulator Ver. 0.6.9 DEV Git # af265e001d3bf043590e480cd6574a14193f6de0 - Rev 12239
+        // based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142 
+        // Updates by WhiteStar Magic 
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)")); 
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif", "osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)\nChanges the Estate Sun Settings, then Triggers a Sun Update\n'sunFixed' TRUE (1) to keep the sun stationary, FALSE (0) to use global time\n'sunHour' The \"Sun Hour\" that is desired, 0...24, with 0 just after SunRise.\n(OpenSim only.)"));
@@ -494,8 +495,11 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunGetParam","f", "s", "float osSunGetParam(string param)\nReturns current float values for param\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunSetParam", "sf", NULL, "osSunSetParam(string param, float value)\nSet's Sun Param for SunSet,\nosSunSetParam(day_length, 24.0)\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindActiveModelPluginName", "s", NULL, "string osWindActiveModelPluginName()\nReturns the Current Working Wind Module Installed\nThese are SimpleRandomWind or ConfigurableWind, optionally others.\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)"));
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));   
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)"));
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));    
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));      
+        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)")); 
+        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)")); 
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osList2Double", "f", "si", "double osList2Double(list src, int index)\nReturns Double (float) Value from src at index.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURL", NULL, "ssssi", "osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer )\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));     
@@ -564,7 +568,9 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetSpeed", NULL, "kf", "osSetSpeed(key AVATAR, float SpeedModifier)\nMultiplies the normal running, walking, and flying speed of the specified avatar.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseDamage", NULL, "kf", "osCauseDamage(key AVATAR, float damage)\nCauses damage to specified AVATAR (UUID).\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseHealing", NULL, "kf", "osCauseHealing(key AVATAR, float healing)\nCauses Healing to specified AVATAR (UUID).\n(OpenSim only.)"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)")); 
        // LightShare functions
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index dfd35bf..1a6ad30 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -484,6 +484,7 @@ set(viewer_SOURCE_FILES
    panelradarentry.cpp
    pipeline.cpp
    primbackup.cpp
+    qtoolalign.cpp
    rlvhandler.cpp
    rlvhelper.cpp
    rlvcommon.cpp
@@ -936,6 +937,7 @@ set(viewer_HEADER_FILES
    panelradarentry.h
    pipeline.h
    primbackup.h
+    qtoolalign.h
    randgauss.h
    rlvdefines.h
    rlvhandler.h
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index 419cacd..3fe2000 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-        <string>Experimental 2010.09.04</string>
+        <string>Experimental 2010.10.17</string>
        <key>CSResourcesFileMapped</key>
        <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 3be4ed4..7b37bb6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,8 @@
  
  <!-- Imprudence-specific settings -->
+  <!-- begin name highlighting -->
+  
  <key>nick01</key>
  <map>
    <key>Comment</key>
@@ -102,6 +104,9 @@
      <real>1</real>
    </array>
  </map>
+  <!-- end name highlighting -->
  <key>AllowMUpose</key>
  <map>
    <key>Comment</key>
@@ -289,6 +294,17 @@
    <key>Value</key>
    <integer>1</integer>
  </map>
+  <key>FetchInventoryOnLogin</key>
+        <map>
+                <key>Comment</key>
+                <string>Automatically fetch the inventory in the background after login (has issues)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+  </map>
  <key>FloaterAnimationListRect</key>
  <map>
    <key>Comment</key>
@@ -380,6 +396,28 @@
    <key>Value</key>
    <string>DroidSans</string>
  </map>
+  <key>FontSizeMultiplier</key>
+  <map>
+    <key>Comment</key>
+    <string>Multiply all font sizes by this amount. Requires viewer restart.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <string>1.0</string>
+  </map>
+  <key>FontSizeRounding</key>
+  <map>
+    <key>Comment</key>
+    <string>Round all font sizes to integer values, to potentially reduce font blurriness. The rounding occurs after FontSizeMultiplier is applied. Requires viewer restart.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
  <key>GoAction</key>
  <map>
    <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index 2745845..f50b594 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
  <viewer version_patch="0" />
  <!--string-->
-  <viewer version_test="Experimental 2010.10.09" />
+  <viewer version_test="Experimental 2010.10.17" />
  
 </viewer_version>
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 443b5bf..991d2fd 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -119,6 +119,10 @@ LocalBitmap::LocalBitmap(std::string fullpath)
                else if (temp_exten == "tga") { this->extension = IMG_EXTEN_TGA; }
                else if (temp_exten == "jpg" || temp_exten == "jpeg") { this->extension = IMG_EXTEN_JPG; }
                else if (temp_exten == "png") { this->extension = IMG_EXTEN_PNG; }
+#ifdef LL_DARWIN
+                else if (temp_exten == "psd") { this->extension = IMG_EXTEN_PSD; }
+                else if (temp_exten == "tif" || temp_exten == "tiff") { this->extension = IMG_EXTEN_TIFF; }
+#endif
                else { return; } // no valid extension.
                /* getting file's last modified */
diff --git a/linden/indra/newview/floaterlocalassetbrowse.h b/linden/indra/newview/floaterlocalassetbrowse.h
index e02a7d3..69afe98 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.h
+++ b/linden/indra/newview/floaterlocalassetbrowse.h
@@ -114,6 +114,10 @@ class LocalBitmap
                        IMG_EXTEN_TGA,
                        IMG_EXTEN_JPG,
                        IMG_EXTEN_PNG
+#ifdef LL_DARWIN
+                        ,IMG_EXTEN_PSD,
+                        IMG_EXTEN_TIFF
+#endif
                };
                enum bitmap_type
diff --git a/linden/indra/newview/impprefsfonts.cpp b/linden/indra/newview/impprefsfonts.cpp
index 3ce71eb..a4dcd34 100644
--- a/linden/indra/newview/impprefsfonts.cpp
+++ b/linden/indra/newview/impprefsfonts.cpp
@@ -29,7 +29,9 @@
 #include "llviewerprecompiledheaders.h"
 #include "impprefsfonts.h"
+#include "llcheckboxctrl.h"
 #include "llradiogroup.h"
+#include "llspinctrl.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
@@ -61,24 +63,64 @@ void ImpPrefsFonts::refresh()
        {
                fonts->setValue( gSavedSettings.getString("FontChoice") );
        }
+        LLSpinCtrl* font_mult = getChild<LLSpinCtrl>("font_mult");
+        if (font_mult)
+        {
+                font_mult->setValue( gSavedSettings.getF32("FontSizeMultiplier") );
+        }
+        LLCheckBoxCtrl* font_round = getChild<LLCheckBoxCtrl>("font_round");
+        if (font_round)
+        {
+                font_round->setValue( gSavedSettings.getBOOL("FontSizeRounding") );
+        }
 }
 void ImpPrefsFonts::apply()
 {
-        LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
+        bool changed = false;
+        LLRadioGroup* fonts = getChild<LLRadioGroup>("fonts");
        if (fonts)
        {
                std::string font_choice = fonts->getValue().asString();
                if (font_choice != gSavedSettings.getString("FontChoice") &&
                    !font_choice.empty())
                {
                        gSavedSettings.setString("FontChoice", font_choice);
-                        LLNotifications::instance().add("ChangeFont");
+                        changed = true;
-                        refresh();
                }
        }
+        LLSpinCtrl* font_mult = getChild<LLSpinCtrl>("font_mult");
+        if (font_mult)
+        {
+                F32 mult = font_mult->getValue().asReal();
+                if (mult != gSavedSettings.getF32("FontSizeMultiplier"))
+                {
+                        gSavedSettings.setF32("FontSizeMultiplier", mult);
+                        changed = true;
+                }
+        }
+        LLCheckBoxCtrl* font_round = getChild<LLCheckBoxCtrl>("font_round");
+        if (font_round)
+        {
+                BOOL round = font_round->getValue().asBoolean();
+                if (round != gSavedSettings.getBOOL("FontSizeRounding"))
+                {
+                        gSavedSettings.setBOOL("FontSizeRounding", round);
+                        changed = true;
+                }
+        }
+        if (changed)
+        {
+                refresh();
+                LLNotifications::instance().add("ChangeFont");
+        }
 }
 void ImpPrefsFonts::cancel()
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 4806dda..4485cdf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -440,8 +440,6 @@ static void settings_to_globals()
        gMapScale = gSavedSettings.getF32("MapScale");
        LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
-        LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
        LLSlider::setScrollWheelMultiplier( gSavedSettings.getS32("SliderScrollWheelMultiplier") );
        LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("PersistShowLookAt");
@@ -779,6 +777,9 @@ bool LLAppViewer::init()
        //
        initWindow();
+        // initWindow also initializes the Feature List, so now we can initialize this global.
+        LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
        {
                BOOL download = gSavedSettings.getBOOL("DownloadClientTags");
@@ -1174,16 +1175,6 @@ bool LLAppViewer::mainLoop()
 bool LLAppViewer::cleanup()
 {
-        //----------------------------------------------
-        //this test code will be removed after the test
-        //test manual call stack tracer
-        if(gSavedSettings.getBOOL("QAMode"))
-        {
-                LLError::LLCallStacks::print() ;
-        }
-        //end of the test code
-        //----------------------------------------------
        //flag all elements as needing to be destroyed immediately
        // to ensure shutdown order
        LLMortician::setZealous(TRUE);
@@ -2704,35 +2695,32 @@ void LLAppViewer::initMarkerFile()
        std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
        std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
-        
        if (LLAPRFile::isExist(mMarkerFileName, LL_APR_RB) && !anotherInstanceRunning())
        {
                gLastExecEvent = LAST_EXEC_FROZE;
                LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL;
        }    
-    
        if(LLAPRFile::isExist(logout_marker_file, LL_APR_RB))
        {
-                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << LL_ENDL;
                gLastExecEvent = LAST_EXEC_LOGOUT_FROZE;
+                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(logout_marker_file);
        }
        if(LLAPRFile::isExist(llerror_marker_file, LL_APR_RB))
        {
-                llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl;
                if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                else gLastExecEvent = LAST_EXEC_LLERROR_CRASH;
+                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(llerror_marker_file);
        }
        if(LLAPRFile::isExist(error_marker_file, LL_APR_RB))
        {
-                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << LL_ENDL;
                if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                else gLastExecEvent = LAST_EXEC_OTHER_CRASH;
+                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << gLastExecEvent << LL_ENDL;
+                LLAPRFile::remove(error_marker_file);
        }
        
-        LLAPRFile::remove(logout_marker_file);
-        LLAPRFile::remove(llerror_marker_file);
-        LLAPRFile::remove(error_marker_file);
-        
        // No new markers if another instance is running.
        if(anotherInstanceRunning()) 
        {
@@ -2790,7 +2778,9 @@ void LLAppViewer::forceQuit()
        LL_INFOS("forceQuit") << "Destroying the entire world" << LL_ENDL;
        if (mQuitRequested)
-        LLApp::setQuitting(); 
+        {
+                LLApp::setQuitting();
+        }
        else
        {
                if (mLogoutRequested) //we just finished a logout request
@@ -3750,15 +3740,6 @@ void LLAppViewer::idleShutdown()
                forceQuit();
        }
-        static bool saved_snapshot = false;
-        if (!saved_snapshot)
-        {
-                saved_snapshot = true;
-                saveFinalSnapshot();
-                return;
-        }
        // Attempt to close all floaters that might be
        // editing things.
        if (gFloaterView)
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 35613b7..54da31b 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -250,11 +250,9 @@ BOOL LLFeatureManager::loadFeatureTables()
        mTableVersion = version;
        LLFeatureList *flp = NULL;
-        while (!file.eof() && file.good())
+        while (file >> name)
        {
                char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
-                file >> name;
                
                if (name.substr(0,2) == "//")
                {
@@ -263,13 +261,6 @@ BOOL LLFeatureManager::loadFeatureTables()
                        continue;
                }
-                if (name.empty())
-                {
-                        // This is a blank line
-                        file.getline(buffer, MAX_STRING);
-                        continue;
-                }
                if (name == "list")
                {
                        if (flp)
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 40b1abb..a59fa06 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -532,12 +532,16 @@ Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callB
                                                {
                                                        if (fileInfo.filetype != 'JPEG' && fileInfo.filetype != 'JPG ' && 
                                                                fileInfo.filetype != 'BMP ' && fileInfo.filetype != 'TGA ' &&
+                                                                fileInfo.filetype != 'TIFF' && fileInfo.filetype != 'PSD ' &&
                                                                fileInfo.filetype != 'BMPf' && fileInfo.filetype != 'TPIC' &&
                                                                fileInfo.filetype != 'PNG ' &&
                                                                (fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("jpeg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                CFStringCompare(fileInfo.extension, CFSTR("jpg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                CFStringCompare(fileInfo.extension, CFSTR("bmp"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                CFStringCompare(fileInfo.extension, CFSTR("tga"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("psd"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("tiff"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("tif"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                CFStringCompare(fileInfo.extension, CFSTR("png"), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
                                                                )
                                                        {
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 9870cf0..9c1d67b 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -138,7 +138,7 @@ LLFloaterAbout::LLFloaterAbout()
 #endif
 #if LL_GNUC
-    support.append(llformat("Built with GCC version %d\n\n", GCC_VERSION));
+        support.append(llformat("Built with GCC version %s\n\n", __VERSION__));
 #endif
        // Position
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index a85ce9d..79e9e31 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -610,9 +610,9 @@ void LLPanelGroups::applyChangesToGroups()
                                }
                                // chat
-                                if (join_group_chat != (!gIMMgr->getIgnoreGroup(group_id)))
+                                if (!join_group_chat != gIMMgr->getIgnoreGroup(group_id))
                                {
-                                        gIMMgr->updateIgnoreGroup(group_id, join_group_chat);
+                                        gIMMgr->updateIgnoreGroup(group_id, !join_group_chat);
                                }
                        }
                }
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index c81081f..8142869 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -355,6 +355,16 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
        {
                codec = IMG_CODEC_PNG;
        }
+#ifdef LL_DARWIN
+        else if( exten == "psd" )
+        {
+                codec = IMG_CODEC_PSD;
+        }
+        else if( exten == "tif" || exten == "tiff" )
+        {
+                codec = IMG_CODEC_TIFF;
+        }
+#endif
        LLPointer<LLImageRaw> raw_image = new LLImageRaw;
 #ifdef LL_DARWIN
@@ -434,9 +444,9 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
                return false;
        }
-        raw_image->biasedScaleToPowerOfTwo(1024);
 #endif
+        raw_image->biasedScaleToPowerOfTwo(1024);
        mRawImagep = raw_image;
        return true;
 }
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 09336cb..f8a0a4f 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -134,8 +134,8 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mMsgPanel(NULL),
        mSkinsPanel(NULL),
        mLCDPanel(NULL),
-        mPrefsAdvanced(NULL),
+        mPrefsFonts(NULL),
-        mPrefsFonts(NULL)
+        mPrefsAdvanced(NULL)
 {
        mGeneralPanel = new LLPanelGeneral();
        mTabContainer->addTabPanel(mGeneralPanel, mGeneralPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
@@ -195,14 +195,14 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
        mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
        mSkinsPanel->setDefaultBtn(default_btn);
-        mPrefsAdvanced = new LLPrefsAdvanced();
-        mTabContainer->addTabPanel(mPrefsAdvanced, mPrefsAdvanced->getLabel(), FALSE, onTabChanged, mTabContainer);
-        mPrefsAdvanced->setDefaultBtn(default_btn);
        mPrefsFonts = new ImpPrefsFonts();
        mTabContainer->addTabPanel(mPrefsFonts, mPrefsFonts->getLabel(), FALSE, onTabChanged, mTabContainer);
        mPrefsFonts->setDefaultBtn(default_btn);
+        mPrefsAdvanced = new LLPrefsAdvanced();
+        mTabContainer->addTabPanel(mPrefsAdvanced, mPrefsAdvanced->getLabel(), FALSE, onTabChanged, mTabContainer);
+        mPrefsAdvanced->setDefaultBtn(default_btn);
        if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
        {
                mTabContainer->selectFirstTab();
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 50e2480..15f278d 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -361,6 +361,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
                        }
                        else
                        {
+                                LLSelectMgr::waitForObjectResponse(mObjectID);
                                // we have to query the simulator for information 
                                // about this object
                                LLMessageSystem* msg = gMessageSystem;
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index c0e972d..a58120d 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -2128,7 +2128,6 @@ BOOL LLFloaterSnapshot::postBuild()
        //gSnapshotFloaterView->addChild(this);
        impl.updateControls(this);
-        impl.updateLayout(this);
        
        return TRUE;
 }
diff --git a/linden/indra/newview/llfloaterteleporthistory.cpp b/linden/indra/newview/llfloaterteleporthistory.cpp
index 65675fa..c901029 100644
--- a/linden/indra/newview/llfloaterteleporthistory.cpp
+++ b/linden/indra/newview/llfloaterteleporthistory.cpp
@@ -108,6 +108,7 @@ BOOL LLFloaterTeleportHistory::postBuild()
        childSetAction("teleport", onTeleport, this);
        childSetAction("show_on_map", onShowOnMap, this);
        childSetAction("copy_slurl", onCopySLURL, this);
+        childSetAction("clear_history", onClearHistory,this);
        loadEntrys();
        return TRUE;
@@ -121,7 +122,13 @@ void LLFloaterTeleportHistory::saveEntry(LLSD toSave)
        LLSDSerialize::toPrettyXML(tpList, file);
        file.close();
 }
+void LLFloaterTeleportHistory::clearHistory()
+{
+        tpList.clear();
+        saveEntry(tpList);
+        mPlacesOutList->clearRows();
+        mPlacesInList->clearRows();
+}
 std::string LLFloaterTeleportHistory::getFileName()
 {
        std::string path=gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "");
@@ -303,6 +310,13 @@ void LLFloaterTeleportHistory::onTeleport(void* data)
 }
 // static
+void LLFloaterTeleportHistory::onClearHistory(void* data)
+{
+        LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
+        self->clearHistory();
+}
+// static
 void LLFloaterTeleportHistory::onShowOnMap(void* data)
 {
        LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
diff --git a/linden/indra/newview/llfloaterteleporthistory.h b/linden/indra/newview/llfloaterteleporthistory.h
index e458259..702daf5 100644
--- a/linden/indra/newview/llfloaterteleporthistory.h
+++ b/linden/indra/newview/llfloaterteleporthistory.h
@@ -63,9 +63,12 @@ class LLFloaterTeleportHistory : public LLFloater
                /// @brief: adds a teleport destination to the list of visited places
                void addEntry(std::string regionName, S16 x, S16 y, S16 z,bool outList);
+                void clearHistory();
        protected:
                static void onInPlacesSelected(LLUICtrl* ctrl, void* data);
                static void onOutPlacesSelected(LLUICtrl* ctrl, void* data);
+                static void onClearHistory(void* data);
                static void onTeleport(void* data);
                static void onShowOnMap(void* data);
                static void onCopySLURL(void* data);
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index f6f09b1..6744faf 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -84,7 +84,7 @@
 #include "llvograss.h"
 #include "llvotree.h"
 #include "lluictrlfactory.h"
+#include "qtoolalign.h"
 #include "hippoLimits.h"
 // Globals
@@ -273,6 +273,8 @@ BOOL	LLFloaterTools::postBuild()
        childSetCommitCallback("radio stretch",commit_select_tool,LLToolCompScale::getInstance());
        mRadioSelectFace = getChild<LLCheckBoxCtrl>("radio select face");
        childSetCommitCallback("radio select face",commit_select_tool,LLToolFace::getInstance());
+        mRadioAlign = getChild<LLCheckBoxCtrl>("radio align");
+        childSetCommitCallback("radio align",commit_select_tool,QToolAlign::getInstance());
        mCheckSelectIndividual = getChild<LLCheckBoxCtrl>("checkbox edit linked parts");
        childSetValue("checkbox edit linked parts",(BOOL)gSavedSettings.getBOOL("EditLinkedParts"));
        childSetCommitCallback("checkbox edit linked parts",commit_select_component,this);
@@ -528,14 +530,54 @@ void LLFloaterTools::refresh()
        mTab->enableTabButton(idx_face, all_volume);
        mTab->enableTabButton(idx_contents, all_volume);
-        // Refresh object and prim count labels
+        // Added in Link Num value -HgB
-        LLLocale locale(LLLocale::USER_LOCALE);
+    if (gSavedSettings.getBOOL("EditLinkedParts") && LLSelectMgr::getInstance()->getEditSelection()->getObjectCount() == 1) //Selecting a single prim in "Edit Linked" mode, show link number
-        std::string obj_count_string;
+    {
-        LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
+                childSetVisible("obj_count", FALSE);
-        childSetTextArg("obj_count",  "[COUNT]", obj_count_string);     
+                childSetVisible("prim_count", FALSE);
-        std::string prim_count_string;
+                childSetVisible("link_num", TRUE);
-        LLResMgr::getInstance()->getIntegerString(prim_count_string, LLSelectMgr::getInstance()->getSelection()->getObjectCount());
-        childSetTextArg("prim_count", "[COUNT]", prim_count_string);
+                std::string value_string = "";
+                LLViewerObject* selected = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                if (selected && selected->getRootEdit())
+                {
+                        LLViewerObject::child_list_t children = selected->getRootEdit()->getChildren();
+                        if (children.empty())
+                        {
+                                // An unlinked prim is "link 0".
+                                value_string = "0";
+                        }
+                        else 
+                        {
+                                children.push_front(selected->getRootEdit()); // need root in the list too
+                                S32 index = 0;
+                                for (LLViewerObject::child_list_t::iterator iter = children.begin(); iter != children.end(); ++iter)
+                                {
+                                        index++;
+                                        if ((*iter)->isSelected())
+                                        {
+                                                LLResMgr::getInstance()->getIntegerString(value_string, index);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                childSetTextArg("link_num", "[NUMBER]", value_string);
+        }
+        else
+        {
+                // Refresh object and prim count labels
+                childSetVisible("obj_count", TRUE);
+                childSetVisible("prim_count", TRUE);
+                childSetVisible("link_num", FALSE);
+                LLLocale locale(LLLocale::USER_LOCALE);
+                std::string obj_count_string;
+                LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
+                childSetTextArg("obj_count",  "[COUNT]", obj_count_string);     
+                std::string prim_count_string;
+                LLResMgr::getInstance()->getIntegerString(prim_count_string, LLSelectMgr::getInstance()->getSelection()->getObjectCount());
+                childSetTextArg("prim_count", "[COUNT]", prim_count_string);
+        }
        updateToolsPrecision();
@@ -658,6 +700,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                                                tool == LLToolCompScale::getInstance() ||
                                                tool == LLToolFace::getInstance() ||
                                                tool == LLToolIndividual::getInstance() ||
+                                                tool == QToolAlign::getInstance() ||
                                                tool == LLToolPipette::getInstance();
        mBtnEdit        ->setToggleState( edit_visible );
@@ -680,6 +723,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
        mRadioPosition  ->set( tool == LLToolCompTranslate::getInstance() );
        mRadioRotate    ->set( tool == LLToolCompRotate::getInstance() );
        mRadioStretch   ->set( tool == LLToolCompScale::getInstance() );
+        mRadioAlign->set( tool == QToolAlign::getInstance() );
        if (mComboGridMode) 
        {
@@ -887,8 +931,15 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                childSetVisible("Strength:", land_visible);
        }
-        childSetVisible("obj_count", !land_visible);
+        if (gSavedSettings.getBOOL("EditLinkedParts") && LLSelectMgr::getInstance()->getEditSelection()->getObjectCount() == 1)
-        childSetVisible("prim_count", !land_visible);
+        {
+                childSetVisible("link_num", !land_visible);
+        }
+        else
+        {
+                childSetVisible("obj_count", !land_visible);
+                childSetVisible("prim_count", !land_visible);
+        }
        mTab->setVisible(!land_visible);
        mPanelLandInfo->setVisible(land_visible);
 }
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index ad5be6c..bbf07ec 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -140,6 +140,7 @@ public:
        LLCheckBoxCtrl  *mRadioRotate;
        LLCheckBoxCtrl  *mRadioStretch;
        LLCheckBoxCtrl  *mRadioSelectFace;
+        LLCheckBoxCtrl  *mRadioAlign;
        LLCheckBoxCtrl  *mCheckSelectIndividual;
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index c3f7b93..bb678d7 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -603,6 +603,207 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
                                LLWeb::loadURLInternal("http://failbook.failblog.org/");
                                return TRUE;
                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhaszombie", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhaszombies", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("zombiecat.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Zombiecat!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhassupport", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhashelp", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhashalp", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://support.imprudenceviewer.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasblog", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://www.imprudenceviewer.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhascodie", cur_token) == 0)
+                        {
+                                LLChat chat;
+                                chat.mText = "All work and no play makes Codie a dull girl. All work and no play...";
+                                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                                LLFloaterChat::addChat(chat);
+                                if (revised_string)
+                                {
+                                        revised_string->assign(LLStringUtil::null);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasfail", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://www.failblog.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasdownload", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasdownloads", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasupdate", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasupdates", cur_token) == 0 )
+                        {
+                                LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/Downloads");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasfeatures", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/Features");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhaswiki", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasbugs", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasbug", cur_token) == 0 )
+                        {
+                                LLWeb::loadURLInternal("http://redmine.imprudenceviewer.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasgit", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://github.com/imprudence/imprudence/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasplurk", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://plurk.com/imprudence");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhastwitter", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://twitter.com/ImpViewer");
+                                return TRUE;
+                        }
+                        
+                        else if (LLStringUtil::compareInsensitive("/icanhasimprudence", cur_token) == 0)
+                        {
+                                LLChat chat;
+                                chat.mText = "You are using it right now, silly!...";
+                                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                                LLFloaterChat::addChat(chat);
+                                if (revised_string)
+                                {
+                                        revised_string->assign(LLStringUtil::null);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasnoms", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasnom", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("nomnom.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Om nom nom!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasceilingcat", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhascielingcat", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("ceilingcat.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Ceiling Cat is watching you!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhascake", cur_token) == 0 )
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("cakeisalie.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "THE CAKE IS A LIE!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhastentacles", cur_token) == 0 )
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("octopus.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "All hail the mighty octopus!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhashugs", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhashug", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("hugs.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Yes, you can has hugs!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
                }
                
                if(!gesture)
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 1b00dfb..8e98cbc 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -196,6 +196,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
        // Sadly, our LLTextEditor can't handle both styled and unstyled text
        // at the same time.  Hence this space must be styled. JC
        text->appendColoredText(std::string(" "),false,false,LLColor4::grey4);
+        text->setParseHTML(TRUE);
        text->appendColoredText(std::string("\n\n") + message,false,false,LLColor4::grey4);
        LLColor4 semi_transparent(1.0f,1.0f,1.0f,0.8f);
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 5061197..2253404 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -613,11 +613,11 @@ void LLIMMgr::addMessage(
        // create IM window as necessary
        if(!floater)
        {
-                if (!mIgnoreGroupList.empty())
+                if (gIMMgr->getIgnoreGroupListCount() > 0 && gAgent.isInGroup(session_id))
                {
                        // Check to see if we're blocking this group's chat
-                        LLGroupData *group_data = NULL;
+                        LLGroupData* group_data = NULL;
+                        
                        // Search for this group in the agent's groups list
                        LLDynamicArray<LLGroupData>::iterator i;
@@ -631,9 +631,8 @@ void LLIMMgr::addMessage(
                        }
                        // If the group is in our list then return
-                        if (group_data && getIgnoreGroup(group_data->mID))
+                        if (group_data && gIMMgr->getIgnoreGroup(group_data->mID))
                        {
-                                // llinfos << "ignoring chat from group " << group_data->mID << llendl;
                                return;
                        }
                }
@@ -1383,7 +1382,7 @@ void LLIMMgr::saveIgnoreGroup()
        }
 }
-void LLIMMgr::updateIgnoreGroup(const LLUUID& group_id, const bool& ignore)
+void LLIMMgr::updateIgnoreGroup(const LLUUID& group_id, bool ignore)
 {
        if (group_id.notNull())
        {
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 8f665d2..2539203 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -174,7 +174,7 @@ public:
        void loadIgnoreGroup();
        void saveIgnoreGroup();
-        void updateIgnoreGroup(const LLUUID& group_id, const bool& ignore);
+        void updateIgnoreGroup(const LLUUID& group_id, bool ignore);
        // Returns true if group chat is ignored for the UUID, false if not
        bool getIgnoreGroup(const LLUUID& group_id);
@@ -219,6 +219,10 @@ private:
        LLSD    mPendingAgentListUpdates;
        std::list<LLUUID> mIgnoreGroupList;
+public:
+                
+        S32 getIgnoreGroupListCount() { return mIgnoreGroupList.size(); }
 };
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 55e1b33..e0d6376 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -561,6 +561,10 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
                gIMMgr->saveIgnoreGroup();
        }
+        mCtrlReceiveNotices->resetDirty();      //resetDirty() here instead of in update because this is where the settings 
+    mCtrlListGroup->resetDirty();               //are actually being applied. onCommitUserOnly doesn't call updateChanged directly.
+        mCtrlReceiveChat->resetDirty();
        mChanged = FALSE;
        return true;
@@ -774,14 +778,21 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                {
                        mCtrlReceiveNotices->setEnabled(mAllowEdit);
                }
-                mCtrlReceiveNotices->resetDirty();
        }
        if (mCtrlReceiveChat)
        {
                mCtrlReceiveChat->setVisible(is_member);
                mCtrlReceiveChat->setEnabled(TRUE);
-                mCtrlReceiveChat->resetDirty();
+        }
+        if (mCtrlListGroup)
+        {
+                mCtrlListGroup->setVisible(is_member);
+                if (is_member)
+                {
+                        mCtrlListGroup->setEnabled(mAllowEdit);
+                }
        }
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 2c8ef4d..e915bd2 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -45,6 +45,7 @@
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "lluictrlfactory.h"
+#include "llstartup.h"
 #include "lldirpicker.h"
@@ -106,22 +107,23 @@ BOOL LLPrefsIMImpl::postBuild()
        childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
        // Don't enable this until we get personal data
-        childDisable("include_im_in_chat_console");
+        // Unless we're already logged in. Some non-SL grids won't send us the data we need -- MC
-        childDisable("include_im_in_chat_history");
+        childSetEnabled("include_im_in_chat_console", LLStartUp::isLoggedIn());
-        childDisable("show_timestamps_check");
+        childSetEnabled("include_im_in_chat_history", LLStartUp::isLoggedIn());
-        childDisable("friends_online_notify_checkbox");
+        childSetEnabled("show_timestamps_check", LLStartUp::isLoggedIn());
+        childSetEnabled("friends_online_notify_checkbox", LLStartUp::isLoggedIn());
        
-        childDisable("online_visibility");
+        childSetEnabled("online_visibility", LLStartUp::isLoggedIn());
-        childDisable("send_im_to_email");
+        childSetEnabled("send_im_to_email", LLStartUp::isLoggedIn());
-        childDisable("log_instant_messages");
+        childSetEnabled("log_instant_messages", LLStartUp::isLoggedIn());
-        childDisable("log_chat");
+        childSetEnabled("log_chat", LLStartUp::isLoggedIn());
-        childDisable("log_show_history");
+        childSetEnabled("log_show_history", LLStartUp::isLoggedIn());
-        childDisable("log_path_button");
+        childSetEnabled("log_path_button", LLStartUp::isLoggedIn());
-        childDisable("busy_response");
+        childSetEnabled("busy_response", LLStartUp::isLoggedIn());
-        childDisable("log_instant_messages_timestamp");
+        childSetEnabled("log_instant_messages_timestamp", LLStartUp::isLoggedIn());
-        childDisable("log_chat_timestamp");
+        childSetEnabled("log_chat_timestamp", LLStartUp::isLoggedIn());
-        childDisable("log_chat_IM");
+        childSetEnabled("log_chat_IM", LLStartUp::isLoggedIn());
-        childDisable("log_date_timestamp");
+        childSetEnabled("log_date_timestamp", LLStartUp::isLoggedIn());
        childSetText("busy_response", getString("log_in_to_change"));
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index f154de9..5a10e98 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4297,6 +4297,12 @@ void LLSelectMgr::requestObjectPropertiesFamily(LLViewerObject* object)
        msg->sendReliable( regionp->getHost() );
 }
+// static
+void LLSelectMgr::waitForObjectResponse(LLUUID id)
+{
+        if (sObjectPropertiesFamilyRequests.count(id) == 0)
+                sObjectPropertiesFamilyRequests.insert(id);
+}
 // static
 void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data)
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index c19d33d..495e61c 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -361,6 +361,7 @@ public:
        ~LLSelectMgr();
        static void cleanupGlobals();
+        static void waitForObjectResponse(LLUUID id);
        // LLEditMenuHandler interface
        virtual BOOL canUndo() const;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index e997e5f..d5adc11 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1073,10 +1073,11 @@ bool idle_startup()
                // color init must be after saved settings loaded
                init_colors();
-                if (gSavedSettings.getBOOL("VivoxLicenseAccepted"))
+                if (gSavedSettings.getBOOL("VivoxLicenseAccepted") || gHippoGridManager->getConnectedGrid()->isSecondLife())
                {
                        // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it
                        // skipping over STATE_UPDATE_CHECK because that just waits for input
+                        // We don't do this on non-SL grids either
                        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
                }
                else
@@ -2788,8 +2789,11 @@ bool idle_startup()
                // Have the agent start watching the friends list so we can update proxies
                gAgent.observeFriends();
-                // Start loading inventory
+                if (gSavedSettings.getBOOL("FetchInventoryOnLogin"))
-                gInventory.startBackgroundFetch();
+                {
+                        // Start loading inventory
+                        gInventory.startBackgroundFetch();
+                }
                if (gSavedSettings.getBOOL("LoginAsGod"))
                {
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 9a3c91c..08862e6 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -124,6 +124,9 @@ public:
        static bool shouldAutoLogin() { return mShouldAutoLogin; };
        static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; };
+        // Returns true if startup has been successfully completed
+        static bool isLoggedIn() { return gStartupState == STATE_STARTED; }
 private:
        static bool mStartedOnce;
        static bool mShouldAutoLogin;
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 432fcc5..1981bb9 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -640,6 +640,38 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                        return;
                }
        }
+#ifdef LL_DARWIN
+        else if(exten == "psd")
+        {
+                asset_type = LLAssetType::AT_TEXTURE;
+                if (!LLViewerImageList::createUploadFile(src_filename,
+                                                                                                 filename,
+                                                                                                 IMG_CODEC_PSD ))
+                {
+                        error_message = llformat("Problem with file %s:\n\n%s\n",
+                                                                         src_filename.c_str(), LLImage::getLastError().c_str());
+                        args["FILE"] = src_filename;
+                        args["ERROR"] = LLImage::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+        else if(exten == "tif" || exten == "tiff")
+        {
+                asset_type = LLAssetType::AT_TEXTURE;
+                if (!LLViewerImageList::createUploadFile(src_filename,
+                                                                                                 filename,
+                                                                                                 IMG_CODEC_TIFF ))
+                {
+                        error_message = llformat("Problem with file %s:\n\n%s\n",
+                                                                         src_filename.c_str(), LLImage::getLastError().c_str());
+                        args["FILE"] = src_filename;
+                        args["ERROR"] = LLImage::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+#endif
        else if(exten == "wav")
        {
                asset_type = LLAssetType::AT_SOUND;  // tag it as audio
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index a512a66..dbf9d72 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -262,6 +262,13 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
                msg->addUUIDFast(_PREHASH_TransactionID, payload["session_id"]);
                msg->sendReliable(LLHost(payload["sender"].asString()));
                break;
+        case 2:
+                // Push another notification
+                // Do we need to check for OfferFriendshipNoMessage here ever? -- MC
+                LLNotifications::instance().add("OfferFriendship", notification["substitutions"], notification["payload"]);
+                LLURLDispatcher::dispatch(llformat("secondlife:///app/agent/%s/about",payload["from_id"].asString().c_str()), NULL, true);
+                break;
+        case 3:
        default:
                // close button probably, possibly timed out
                break;
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index 535c504..afd9b95 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -73,10 +73,10 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
        // Load Terrain Textures - Original ones
        // Load from file as OpenSim-based grids don't include these yet -- MC
-        setDetailTextureID(0, TERRAIN_DIRT_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(0, TERRAIN_DIRT_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_DIRT_DETAIL);
-        setDetailTextureID(1, TERRAIN_GRASS_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(1, TERRAIN_GRASS_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_GRASS_DETAIL);
-        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_MOUNTAIN_DETAIL);
-        setDetailTextureID(3, TERRAIN_ROCK_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(3, TERRAIN_ROCK_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_ROCK_DETAIL);
        // Initialize the texture matrix to defaults.
        for (S32 i = 0; i < CORNER_COUNT; ++i)
@@ -112,13 +112,13 @@ void LLVLComposition::setDetailTextureID(S32 corner, const LLUUID& id)
        mRawImages[corner] = NULL;
 }
-void LLVLComposition::setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate)
+void LLVLComposition::setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate,  LLGLint internal_format, LLGLenum primary_format, const LLUUID& force_id)
 {
        if(filename.empty())
        {
                return;
        }
-        mDetailTextures[corner] = gImageList.getImageFromFile(filename, usemipmap, levelimmediate);
+        mDetailTextures[corner] = gImageList.getImageFromFile(filename, usemipmap, levelimmediate, internal_format, primary_format, force_id);
        mDetailTextures[corner]->setNoDelete() ;
        mRawImages[corner] = NULL;
 }
diff --git a/linden/indra/newview/llvlcomposition.h b/linden/indra/newview/llvlcomposition.h
index 4ae296c..eb61bfd 100644
--- a/linden/indra/newview/llvlcomposition.h
+++ b/linden/indra/newview/llvlcomposition.h
@@ -67,7 +67,7 @@ public:
        F32 getHeightRange(S32 corner);
        void setDetailTextureID(S32 corner, const LLUUID& id);
-        void setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate);
+        void setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate,  LLGLint internal_format, LLGLenum primary_format, const LLUUID& force_id);
        void setStartHeight(S32 corner, F32 start_height);
        void setHeightRange(S32 corner, F32 range);
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 5a6b35d..b9111d3 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -121,6 +121,7 @@ BOOL LLWindlightRemoteCtrl::postBuild()
        LLComboBox*     presetsCombo = getChild<LLComboBox>("Presets");
        if (presetsCombo)
        {
+                presetsCombo->setSimple(LLWLParamManager::instance()->mCurParams.mName);
                presetsCombo->setCommitCallback(onCommitPreset);
                presetsCombo->setCallbackUserData(this);
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index 8ff5fad..a868ee2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -114,7 +114,9 @@ bool PanelRadar::isImpDev(const LLUUID& agent_id)
        std::string agent_name = getSelectedName(agent_id);
        return (agent_name == "McCabe Maxsted" || 
                agent_name == "Jacek Antonelli" ||
-                agent_name == "Armin Weatherwax");
+                agent_name == "Armin Weatherwax" ||
+                        agent_name == "Elektra Hesse" || 
+                        agent_name == "CodeBastard Redgrave");
 }
 void PanelRadar::updateRadarInfo()
diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
new file mode 100644
index 0000000..d7f7ad0
--- /dev/null
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -0,0 +1,585 @@
+/** 
+ * @file qtoolalign.cpp
+ * @brief A tool to align objects
+ * @author Karl Stiefvater (Qarl)
+ *
+ * Karl has given permission to use this code under the terms of
+ * the GNU GPL v2 plus FLOSS exception and/or the GNU LGPL v2.1.
+ *
+ * Backported for Viewer 1.X code base by Jacek Antonelli.
+ */
+#include "llviewerprecompiledheaders.h"
+// File includes
+#include "qtoolalign.h"
+// Library includes
+#include "llbbox.h"
+#include "v3math.h"
+// Viewer includes
+#include "llagent.h"
+#include "llbox.h"
+#include "llcylinder.h"
+#include "llfloatertools.h"
+#include "llselectmgr.h"
+#include "llviewercamera.h"
+#include "llviewercontrol.h"
+#include "llviewerobject.h"
+#include "llviewerwindow.h"
+const F32 MANIPULATOR_SIZE = 5.0;
+const F32 MANIPULATOR_SELECT_SIZE = 20.0;
+QToolAlign::QToolAlign()
+:       LLTool(std::string("Align"))
+{
+}
+QToolAlign::~QToolAlign()
+{
+}
+BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+        if (mHighlightedAxis != -1)
+        {
+                align();
+        }
+        else
+        {
+                gViewerWindow->pickAsync(x, y, mask, pickCallback);
+        }
+                
+        return TRUE;
+}
+void QToolAlign::pickCallback(const LLPickInfo& pick_info)
+{
+        LLViewerObject* object = pick_info.getObject();
+        if (object)
+        {
+                if (object->isAvatar())
+                {
+                        return;
+                }
+                if (pick_info.mKeyMask & MASK_SHIFT)
+                {
+                        // If object not selected, select it
+                        if ( !object->isSelected() )
+                        {
+                                LLSelectMgr::getInstance()->selectObjectAndFamily(object);
+                        }
+                        else
+                        {
+                                LLSelectMgr::getInstance()->deselectObjectAndFamily(object);
+                        }
+                }
+                else
+                {
+                        LLSelectMgr::getInstance()->deselectAll();
+                        LLSelectMgr::getInstance()->selectObjectAndFamily(object);
+                }
+                
+        }
+        else
+        {
+                if (!(pick_info.mKeyMask == MASK_SHIFT))
+                {
+                        LLSelectMgr::getInstance()->deselectAll();
+                }
+        }
+        LLSelectMgr::getInstance()->promoteSelectionToRoot();
+}
+void QToolAlign::handleSelect()
+{
+        // no parts, please
+        llwarns << "in select" << llendl;
+        LLSelectMgr::getInstance()->promoteSelectionToRoot();
+}
+void QToolAlign::handleDeselect()
+{
+}
+BOOL QToolAlign::findSelectedManipulator(S32 x, S32 y)
+{
+        mHighlightedAxis = -1;
+        mHighlightedDirection = 0;
+        LLMatrix4 transform;
+        if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
+        {
+                LLVector4 translation(mBBox.getCenterAgent());
+                transform.initRotTrans(mBBox.getRotation(), translation);
+                LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
+                transform *= cfr;
+                LLMatrix4 window_scale;
+                F32 zoom_level = 2.f * gAgent.mHUDCurZoom;
+                window_scale.initAll(LLVector3(zoom_level / LLViewerCamera::getInstance()->getAspect(), zoom_level, 0.f),
+                                                         LLQuaternion::DEFAULT,
+                                                         LLVector3::zero);
+                transform *= window_scale;
+        }
+        else
+        {
+                transform.initAll(LLVector3(1.f, 1.f, 1.f), mBBox.getRotation(), mBBox.getCenterAgent());
+                LLMatrix4 projection_matrix = LLViewerCamera::getInstance()->getProjection();
+                LLMatrix4 model_matrix = LLViewerCamera::getInstance()->getModelview();
+                transform *= model_matrix;
+                transform *= projection_matrix;
+        }
+        //LLRect world_view_rect = getWorldViewRectScaled();
+        F32 half_width = (F32)gViewerWindow->getWindowWidth() / 2.f;
+        F32 half_height = (F32)gViewerWindow->getWindowHeight() / 2.f;
+        LLVector2 manip2d;
+        LLVector2 mousePos((F32)x - half_width, (F32)y - half_height);
+        LLVector2 delta;
+        LLVector3 bbox_scale = mBBox.getMaxLocal() - mBBox.getMinLocal();
+        
+        for (S32 axis = VX; axis <= VZ; axis++)
+        {
+                for (F32 direction = -1.0; direction <= 1.0; direction += 2.0)
+                {
+                        LLVector3 axis_vector = LLVector3(0,0,0);
+                        axis_vector.mV[axis] = direction * bbox_scale.mV[axis] / 2.0;
+                        
+                        LLVector4 manipulator_center =  LLVector4(axis_vector);
+                        LLVector4 screen_center = manipulator_center * transform;
+                        screen_center /= screen_center.mV[VW];
+                        manip2d.setVec(screen_center.mV[VX] * half_width, screen_center.mV[VY] * half_height);
+                        delta = manip2d - mousePos;
+                        if (delta.magVecSquared() < MANIPULATOR_SELECT_SIZE * MANIPULATOR_SELECT_SIZE)
+                        {
+                                mHighlightedAxis = axis;
+                                mHighlightedDirection = direction;
+                                return TRUE;
+                        }
+                }
+        }
+        return FALSE;
+}
+BOOL QToolAlign::handleHover(S32 x, S32 y, MASK mask)
+{
+        if (mask & MASK_SHIFT)
+        {
+                mForce = FALSE;
+        }
+        else
+        {
+                mForce = TRUE;
+        }
+        
+        gViewerWindow->setCursor(UI_CURSOR_ARROW);
+        return findSelectedManipulator(x, y);
+}
+void setup_transforms_bbox(LLBBox bbox)
+{
+        // translate to center
+        LLVector3 center = bbox.getCenterAgent();
+        gGL.translatef(center.mV[VX], center.mV[VY], center.mV[VZ]);
+        // rotate
+        LLQuaternion rotation = bbox.getRotation();
+        F32 angle_radians, x, y, z;
+        rotation.getAngleAxis(&angle_radians, &x, &y, &z);
+        // gGL has no rotate method (despite having translate and scale) presumably because
+        // its authors smoke crack.  so we hack.
+        gGL.flush();
+        glRotatef(angle_radians * RAD_TO_DEG, x, y, z); 
+        // scale
+        LLVector3 scale = bbox.getMaxLocal() - bbox.getMinLocal();
+        gGL.scalef(scale.mV[VX], scale.mV[VY], scale.mV[VZ]);
+}
+void render_bbox(LLBBox bbox)
+{
+        glMatrixMode(GL_MODELVIEW);
+        gGL.pushMatrix();
+        setup_transforms_bbox(bbox);
+        gGL.flush();
+        gBox.render();
+        gGL.popMatrix();
+}
+void render_cone_bbox(LLBBox bbox)
+{
+        glMatrixMode(GL_MODELVIEW);
+        gGL.pushMatrix();
+        setup_transforms_bbox(bbox);
+        gGL.flush();
+        gCone.render(CONE_LOD_HIGHEST);
+        gGL.popMatrix();
+}
+// the selection bbox isn't axis aligned, so we must construct one
+// should this be cached in the selection manager?  yes.
+LLBBox get_selection_axis_aligned_bbox()
+{
+        LLBBox selection_bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
+        LLVector3 position = selection_bbox.getPositionAgent();
+        
+        LLBBox axis_aligned_bbox = LLBBox(position, LLQuaternion(), LLVector3(), LLVector3());
+        axis_aligned_bbox.addPointLocal(LLVector3());
+        // cycle over the nodes in selection
+        for (LLObjectSelection::iterator selection_iter = LLSelectMgr::getInstance()->getSelection()->begin();
+                 selection_iter != LLSelectMgr::getInstance()->getSelection()->end();
+                 ++selection_iter)
+        {
+                LLSelectNode *select_node = *selection_iter;
+                if (select_node)
+                {
+                        LLViewerObject* object = select_node->getObject();
+                        if (object)
+                        {
+                                axis_aligned_bbox.addBBoxAgent(object->getBoundingBoxAgent());
+                        }
+                }
+        }
+        
+        return axis_aligned_bbox;
+}
+void QToolAlign::computeManipulatorSize()
+{
+        if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
+        {
+                mManipulatorSize = MANIPULATOR_SIZE / (LLViewerCamera::getInstance()->getViewHeightInPixels() *
+                                                                                           gAgent.mHUDCurZoom);
+        }
+        else
+        {
+                F32 distance = dist_vec(gAgent.getCameraPositionAgent(), mBBox.getCenterAgent());
+                if (distance > 0.001f)
+                {
+                        // range != zero
+                        F32 fraction_of_fov = MANIPULATOR_SIZE /LLViewerCamera::getInstance()->getViewHeightInPixels();
+                        F32 apparent_angle = fraction_of_fov * LLViewerCamera::getInstance()->getView();  // radians
+                        mManipulatorSize = MANIPULATOR_SIZE * distance * tan(apparent_angle);
+                }
+                else
+                {
+                        // range == zero
+                        mManipulatorSize = MANIPULATOR_SIZE;
+                }
+        }
+}
+LLColor4 manipulator_color[3] = { LLColor4(0.7f, 0.0f, 0.0f, 0.5f),
+                                                                   LLColor4(0.0f, 0.7f, 0.0f, 0.5f),
+                                                                   LLColor4(0.0f, 0.0f, 0.7f, 0.5f) };
+                                                                   
+void QToolAlign::renderManipulators()
+{
+        computeManipulatorSize();
+        LLVector3 bbox_center = mBBox.getCenterAgent();
+        LLVector3 bbox_scale = mBBox.getMaxLocal() - mBBox.getMinLocal();
+        
+        for (S32 axis = VX; axis <= VZ; axis++)
+                for (F32 direction = -1.0; direction <= 1.0; direction += 2.0)
+                {
+                        F32 size = mManipulatorSize;
+                        LLColor4 color = manipulator_color[axis];
+                        if ((axis == mHighlightedAxis) && (direction == mHighlightedDirection))
+                        {
+                                size *= 2.0;
+                                color *= 1.5;
+                        }
+                        S32 arrows = 1;
+                        if (mForce)
+                        {
+                                arrows = 2;
+                        }
+                        for (S32 i = 0; i < arrows; i++)
+                        {
+                                LLVector3 axis_vector = LLVector3(0,0,0);
+                                axis_vector.mV[axis] = direction * (bbox_scale.mV[axis] / 2.0 + i * (size/3.0));
+                        
+                                LLVector3 manipulator_center =  bbox_center + axis_vector;
+                                LLQuaternion manipulator_rotation;
+                                manipulator_rotation.shortestArc(LLVector3(0,0,1), -1.0 * axis_vector);
+                                
+                                LLBBox manipulator_bbox = LLBBox(manipulator_center, manipulator_rotation,
+                                                                                                 LLVector3(), LLVector3());
+                                manipulator_bbox.addPointLocal(LLVector3(-1, -1, -0.75) * size * 0.5);
+                                manipulator_bbox.addPointLocal(LLVector3(1, 1, 0.75) * size * 0.5);
+                        
+                                gGL.color4fv(color.mV);
+                                // sadly, gCone doesn't use gGL like gBox does (presumably because its author smokes crack) so we
+                                // also set the raw GL color.  hopefully this won't screw-up later rendering.
+                                glColor4fv(color.mV);
+                                render_cone_bbox(manipulator_bbox);
+                        }
+                }
+}
+void QToolAlign::render()
+{
+        mBBox = get_selection_axis_aligned_bbox();
+        // Draw bounding box
+        LLGLSUIDefault gls_ui;
+        LLGLEnable gl_blend(GL_BLEND);
+        LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
+        LLGLDepthTest gls_depth(GL_FALSE);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+        // render box
+        LLColor4 default_normal_color( 0.7f, 0.7f, 0.7f, 0.1f );
+        gGL.color4fv( default_normal_color.mV );
+        render_bbox(mBBox);
+        renderManipulators();
+}
+// only works for our specialized (AABB, position centered) bboxes
+BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
+{
+        const F32 FUDGE = 0.001f;  // because of stupid SL precision/rounding
+        
+        LLVector3 delta = bbox1.getCenterAgent() - bbox2.getCenterAgent();
+        LLVector3 half_extent = (bbox1.getExtentLocal() + bbox2.getExtentLocal()) / 2.0;
+        return ((fabs(delta.mV[VX]) < half_extent.mV[VX] - FUDGE) &&
+                        (fabs(delta.mV[VY]) < half_extent.mV[VY] - FUDGE) &&
+                        (fabs(delta.mV[VZ]) < half_extent.mV[VZ] - FUDGE));
+}
+// used to sort bboxes before packing
+class BBoxCompare
+{
+public:
+        BBoxCompare(S32 axis, F32 direction, std::map<LLPointer<LLViewerObject>, LLBBox >& bboxes) :
+                mAxis(axis), mDirection(direction), mBBoxes(bboxes) {}
+        BOOL operator() (LLViewerObject* object1, LLViewerObject* object2)
+        {
+                LLVector3 corner1 = mBBoxes[object1].getCenterAgent() -
+                        mDirection * mBBoxes[object1].getExtentLocal()/2.0;
+                LLVector3 corner2 = mBBoxes[object2].getCenterAgent() -
+                        mDirection * mBBoxes[object2].getExtentLocal()/2.0;
+                
+                return mDirection * corner1.mV[mAxis] < mDirection * corner2.mV[mAxis];
+        }
+        S32 mAxis;
+        F32 mDirection;
+        std::map<LLPointer<LLViewerObject>, LLBBox >& mBBoxes;
+};
+void QToolAlign::align()
+{
+        // no linkset parts, please
+        LLSelectMgr::getInstance()->promoteSelectionToRoot();
+        
+        std::vector<LLPointer<LLViewerObject> > objects;
+        std::map<LLPointer<LLViewerObject>, LLBBox > original_bboxes;
+        
+    // cycle over the nodes in selection and collect them into an array
+        for (LLObjectSelection::root_iterator selection_iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
+                 selection_iter != LLSelectMgr::getInstance()->getSelection()->root_end();
+                 ++selection_iter)
+        {
+                LLSelectNode *select_node = *selection_iter;
+                if (select_node)
+                {
+                        LLViewerObject* object = select_node->getObject();
+                        if (object)
+                        {
+                                LLVector3 position = object->getPositionAgent();
+        
+                                LLBBox bbox = LLBBox(position, LLQuaternion(), LLVector3(), LLVector3());
+                                bbox.addPointLocal(LLVector3());
+                                // add the parent's bbox
+                                bbox.addBBoxAgent(object->getBoundingBoxAgent());
+                                LLViewerObject::const_child_list_t& children = object->getChildren();
+                                for (LLViewerObject::const_child_list_t::const_iterator i = children.begin();
+                                         i != children.end(); i++)
+                                {
+                                        // add the child's bbox
+                                        LLViewerObject* child = *i;
+                                        bbox.addBBoxAgent(child->getBoundingBoxAgent());
+                                }
+                                
+                                objects.push_back(object);
+                                original_bboxes[object] = bbox;
+                        }
+                }
+        }
+        S32 axis = mHighlightedAxis;
+        F32 direction = mHighlightedDirection;
+        // sort them into positional order for proper packing
+        BBoxCompare compare(axis, direction, original_bboxes);
+        sort(objects.begin(), objects.end(), compare);
+        // storage for their new position after alignment - start with original position first
+        std::map<LLPointer<LLViewerObject>, LLBBox > new_bboxes = original_bboxes;
+        // find new positions
+        for (S32 i = 0; i < (S32)objects.size(); i++)
+        {
+                LLBBox target_bbox = mBBox;
+                LLVector3 target_corner = target_bbox.getCenterAgent() - 
+                        direction * target_bbox.getExtentLocal() / 2.0;
+        
+                LLViewerObject* object = objects[i];
+                LLBBox this_bbox = original_bboxes[object];
+                LLVector3 this_corner = this_bbox.getCenterAgent() -
+                        direction * this_bbox.getExtentLocal() / 2.0;
+                // for packing, we cycle over several possible positions, taking the smallest that does not overlap
+                F32 smallest = direction * 9999999;  // 999999 guarenteed not to be the smallest
+                for (S32 j = 0; j <= i; j++)
+                {
+                        // how far must it move?
+                        LLVector3 delta = target_corner - this_corner;
+                        // new position moves only on one axis, please
+                        LLVector3 delta_one_axis = LLVector3(0,0,0);
+                        delta_one_axis.mV[axis] = delta.mV[axis];
+                        
+                        LLVector3 new_position = this_bbox.getCenterAgent() + delta_one_axis;
+                        // construct the new bbox
+                        LLBBox new_bbox = LLBBox(new_position, LLQuaternion(), LLVector3(), LLVector3());
+                        new_bbox.addPointLocal(this_bbox.getExtentLocal() / 2.0);
+                        new_bbox.addPointLocal(-1.0 * this_bbox.getExtentLocal() / 2.0);
+                        // check to see if it overlaps the previously placed objects
+                        BOOL overlap = FALSE;
+                        llwarns << "i=" << i << " j=" << j << llendl;
+                        
+                        if (!mForce) // well, don't check if in force mode
+                        {
+                                for (S32 k = 0; k < i; k++)
+                                {
+                                        LLViewerObject* other_object = objects[k];
+                                        LLBBox other_bbox = new_bboxes[other_object];
+                                        BOOL overlaps_this = bbox_overlap(other_bbox, new_bbox);
+                                        if (overlaps_this)
+                                        {
+                                                llwarns << "overlap" << new_bbox.getCenterAgent() << other_bbox.getCenterAgent() << llendl;
+                                                llwarns << "extent" << new_bbox.getExtentLocal() << other_bbox.getExtentLocal() << llendl;
+                                        }
+                                        overlap = (overlap || overlaps_this);
+                                }
+                        }
+                        if (!overlap)
+                        {
+                                F32 this_value = (new_bbox.getCenterAgent() -
+                                                                  direction * new_bbox.getExtentLocal() / 2.0).mV[axis];
+                                if (direction * this_value < direction * smallest)
+                                {
+                                        smallest = this_value;
+                                        // store it
+                                        new_bboxes[object] = new_bbox;
+                                }
+                        }
+                        // update target for next time through the loop
+                        if (j < (S32)objects.size())
+                        {
+                                LLBBox next_bbox = new_bboxes[objects[j]];
+                                target_corner = next_bbox.getCenterAgent() +
+                                        direction * next_bbox.getExtentLocal() / 2.0;
+                        }
+                }
+        }
+        
+        // now move them
+        for (S32 i = 0; i < (S32)objects.size(); i++)
+        {
+                LLViewerObject* object = objects[i];
+                LLBBox original_bbox = original_bboxes[object];
+                LLBBox new_bbox = new_bboxes[object];
+                LLVector3 delta = new_bbox.getCenterAgent() - original_bbox.getCenterAgent();
+                
+                LLVector3 original_position = object->getPositionAgent();
+                LLVector3 new_position = original_position + delta;
+                object->setPosition(new_position);
+        }
+        
+        
+        LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
+}
diff --git a/linden/indra/newview/qtoolalign.h b/linden/indra/newview/qtoolalign.h
new file mode 100644
index 0000000..b2c18b7
--- /dev/null
+++ b/linden/indra/newview/qtoolalign.h
@@ -0,0 +1,50 @@
+/** 
+ * @file qtoolalign.h
+ * @brief A tool to align objects
+ * @author Karl Stiefvater (Qarl)
+ *
+ * Karl has given permission to use this code under the terms of
+ * the GNU GPL v2 plus FLOSS exception and/or the GNU LGPL v2.1.
+ *
+ * Backported for Viewer 1.X code base by Jacek Antonelli.
+ */
+#ifndef Q_QTOOLALIGN_H
+#define Q_QTOOLALIGN_H
+#include "lltool.h"
+#include "llbbox.h"
+class LLViewerObject;
+class LLPickInfo;
+class LLToolSelectRect;
+class QToolAlign
+:       public LLTool, public LLSingleton<QToolAlign>
+{
+public:
+        QToolAlign();
+        virtual ~QToolAlign();
+        virtual void    handleSelect();
+        virtual void    handleDeselect();
+        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
+        virtual void    render();
+        static void pickCallback(const LLPickInfo& pick_info);
+private:
+        void            align();
+        void            computeManipulatorSize();
+        void            renderManipulators();
+        BOOL            findSelectedManipulator(S32 x, S32 y);
+        
+        LLBBox          mBBox;
+        F32             mManipulatorSize;
+        S32             mHighlightedAxis;
+        F32             mHighlightedDirection;
+        BOOL            mForce;
+};
+#endif // Q_QTOOLALIGN_H
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
index db36df5..13956e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-                min_width="500" min_height="250" width="500" height="250" name="teleporthistory"
+                min_width="600" min_height="250" width="600" height="250" name="teleporthistory"
                rect_control="FloaterTeleportHistoryRect" title="Teleport History">
        <tab_container label="TPlistTabs" bottom="40" height="185" left="5" follows="left|top|right|bottom" mouse_opaque="false" name="tplisttabs"
             tab_min_width="50" tab_position="top" width="480" right="-10" bg_opaque_color="0,0,0,0.0">
@@ -39,6 +39,10 @@
                height="20" label="Show On Map" label_selected="Show On Map"
                left_delta="100" mouse_opaque="true" name="show_on_map"
                tool_tip="Center map on this location" width="125" />
+        <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif" halign="center"
+                height="20" label="Clear History"
+                left_delta="135" mouse_opaque="true" name="clear_history"
+                tool_tip="Clear Saved Teleport History" width="125" />
        <button bottom_delta="0" enabled="false" follows="bottom|right" font="SansSerif"
                height="20" label="Copy SLURL to clipboard" left="-190" name="copy_slurl"
                tool_tip="Copies current location as SLURL to be used on the web."
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 0cb4a59..d7a2013 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
@@ -79,6 +79,10 @@
        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Select faces to texture" left="4" mouse_opaque="true"
             name="radio select face" radio_style="true" width="114" />
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
+             name="radio align" radio_style="true" width="114"
+       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Edit linked parts" left="4" mouse_opaque="true"
@@ -321,6 +325,12 @@
       mouse_opaque="true" name="prim_count" v_pad="0" width="143">
    Primitives: [COUNT]
  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="right" height="16"
+     mouse_opaque="true" name="link_num" v_pad="0" width="143">
+    Link number: [NUMBER]
+  </text>
 <!-- Sub-tabs -->
@@ -1085,7 +1095,7 @@
        Glow:
      </text>
                        <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" left="180" max_val="1"
+                             increment="0.05" initial_val="0" left="180" max_val="1"
                             min_val="0" mouse_opaque="true" name="glow" width="58" />
                        <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Full bright" left="180" mouse_opaque="true"
@@ -1202,13 +1212,13 @@
                             mouse_opaque="true" name="tex scale" v_pad="0" width="160">
        Repeats Per Face:
      </text>
-      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                             initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                             max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
                        <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
                             initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
                             name="checkbox flip s" width="70" />
-                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                             initial_val="0" label="Vertical (V):" label_width="90" left="20"
                             max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
                        <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
@@ -1247,11 +1257,11 @@
                             mouse_opaque="true" name="tex offset" v_pad="0" width="160">
        Offset:
      </text>
-                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                             initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                             max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
                        <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" label="Vertical (V):" label_width="90"
+                             increment="0.05" initial_val="0" label="Vertical (V):" label_width="90"
                             left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
                             width="160" />
                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 5564079..7343ac2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -153,7 +153,7 @@
             />
  <font_size name="Small"
             comment="Size of small font (points, or 1/72 of an inch)"
-             size="8"
+             size="8.5"
             />
 </fonts>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index d7b078c..0ac7401 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -902,32 +902,32 @@ Would you like to disable all popups which can be skipped?
 </notification>
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
 name="CacheWillClear"
- type="alertmodal">
+ type="notify">
 Cache will be cleared after you restart [VIEWER_NAME].
 </notification>
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
 name="CacheWillBeMoved"
- type="alertmodal">
+ type="notify">
 Cache will be moved after you restart [VIEWER_NAME].
 Note: This will clear the cache.
 </notification>
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
 name="ChangeConnectionPort"
- type="alertmodal">
+ type="notify">
 Port settings take effect after you restart [VIEWER_NAME].
 </notification>
 <notification
- icon="alertmodal.tga"
+ icon="notify.tga"
 name="ChangeSkin"
- type="alertmodal">
+ type="notify">
 The new skin will appear after you restart [VIEWER_NAME].
 </notification>
@@ -6009,8 +6009,12 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
     index="1"
     name="Decline"
     text="Decline"/>
+    <button 
+      index="2" 
+      name="Profile" 
+      text="Profile"/>
    <button
-     index="2"
+     index="3"
     name="Ignore"
     text="Ignore"/>
  </form>
@@ -6033,7 +6037,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
     name="Decline"
     text="Decline"/>
    <button
-     index="2"
+    index="2"
+    name="Profile"
+    text="Profile"/>
+    <button
+     index="3"
     name="Ignore"
     text="Ignore"/>
  </form>
@@ -7000,6 +7008,7 @@ IM history could not be found for [NAME].
 type="alert">
 Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy!
  <usetemplate
+   ignoretext="When setting Show Look At"
   name="okignore"
   yestext="OK"/>
 </notification>
@@ -7095,8 +7104,8 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
 <notification
 name="ChangeFont"
- icon="alertmodal.tga"
+ icon="notify.tga"
- type="alertmodal">
+ type="notify">
 The new font will appear after you restart [VIEWER_NAME].
 </notification>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
index 5865bec..c64ce9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_fonts.xml
@@ -46,4 +46,14 @@
    Preview: The quick brown fox jumped over the lazy dog. :)
  </text>
+  <spinner name="font_mult" label="Font size multiplier:" label_width="130"
+           bottom="-280" left="20" height="16" width="180" follows="left|top"
+           decimal_digits="2" increment="0.01" max_val="3.0" min_val="0.1"
+           tool_tip="Multiply all font sizes by this amount." />
+  <check_box name="font_round" follows="left|top"
+             bottom="-300" left="20" height="16" width="300"
+             label="Force integer font sizes (may fix blurry fonts)" />
 </panel>