Merge branch 'weekly' into webkit_plugins

42 files changed, 1121 insertions, 141 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 6596d39..fb67423 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -485,6 +485,7 @@ set(viewer_SOURCE_FILES
     panelradarentry.cpp
     pipeline.cpp
     primbackup.cpp
+    qtoolalign.cpp
     rlvhandler.cpp
     rlvhelper.cpp
     rlvcommon.cpp
@@ -940,6 +941,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 fc5a7c8..11555fa 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -396,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 f50b594..ab4b720 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.17" />
+  <viewer version_test="Experimental 2010.10.23" />
   
 </viewer_version>
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");
-                        refresh();
+                        changed = true;
                 }
         }
+
+        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/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index a94f7cf..b740725 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/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/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index fc72467..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);
@@ -698,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 );
@@ -720,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) 
         {
@@ -927,7 +931,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 childSetVisible("Strength:", land_visible);
         }
 
-        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        if (gSavedSettings.getBOOL("EditLinkedParts") && LLSelectMgr::getInstance()->getEditSelection()->getObjectCount() == 1)
         {
                 childSetVisible("link_num", !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/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");
-        childDisable("include_im_in_chat_history");
-        childDisable("show_timestamps_check");
-        childDisable("friends_online_notify_checkbox");
+        // Unless we're already logged in. Some non-SL grids won't send us the data we need -- MC
+        childSetEnabled("include_im_in_chat_console", LLStartUp::isLoggedIn());
+        childSetEnabled("include_im_in_chat_history", LLStartUp::isLoggedIn());
+        childSetEnabled("show_timestamps_check", LLStartUp::isLoggedIn());
+        childSetEnabled("friends_online_notify_checkbox", LLStartUp::isLoggedIn());
         
-        childDisable("online_visibility");
-        childDisable("send_im_to_email");
-        childDisable("log_instant_messages");
-        childDisable("log_chat");
-        childDisable("log_show_history");
-        childDisable("log_path_button");
-        childDisable("busy_response");
-        childDisable("log_instant_messages_timestamp");
-        childDisable("log_chat_timestamp");
-        childDisable("log_chat_IM");
-        childDisable("log_date_timestamp");
+        childSetEnabled("online_visibility", LLStartUp::isLoggedIn());
+        childSetEnabled("send_im_to_email", LLStartUp::isLoggedIn());
+        childSetEnabled("log_instant_messages", LLStartUp::isLoggedIn());
+        childSetEnabled("log_chat", LLStartUp::isLoggedIn());
+        childSetEnabled("log_show_history", LLStartUp::isLoggedIn());
+        childSetEnabled("log_path_button", LLStartUp::isLoggedIn());
+        childSetEnabled("busy_response", LLStartUp::isLoggedIn());
+        childSetEnabled("log_instant_messages_timestamp", LLStartUp::isLoggedIn());
+        childSetEnabled("log_chat_timestamp", LLStartUp::isLoggedIn());
+        childSetEnabled("log_chat_IM", LLStartUp::isLoggedIn());
+        childSetEnabled("log_date_timestamp", LLStartUp::isLoggedIn());
 
         childSetText("busy_response", getString("log_in_to_change"));
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 402afdb..49446c7 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1081,10 +1081,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
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/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index b5ad435..f63deb8 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -157,7 +157,7 @@ public:
 
         void callbackHttpGet(const LLChannelDescriptors& channels,
                                                  const LLIOPipe::buffer_ptr_t& buffer,
-                                                 bool last_block, bool success);
+                                                 bool partial, bool unsatisfiable, bool success);
         void callbackCacheRead(bool success, LLImageFormatted* image,
                                                    S32 imagesize, BOOL islocal);
         void callbackCacheWrite(bool success);
@@ -317,13 +317,14 @@ public:
                         mFetcher->mTextureInfo.setRequestCompleteTimeAndLog(mID, timeNow);
                 }
 
-                lldebugs << "HTTP COMPLETE: " << mID << llendl;
+                LL_DEBUGS("TextureFetch") << "HTTP COMPLETE: " << mID << " with status: " << status << LL_ENDL;
                 mFetcher->lockQueue();
                 LLTextureFetchWorker* worker = mFetcher->getWorker(mID);
                 if (worker)
                 {
                         bool success = false;
                         bool partial = false;
+                        bool unsatisfiable = false;
                         if (200 <= status &&  status < 300)
                         {
                                 success = true;
@@ -332,18 +333,19 @@ public:
                                         partial = true;
                                 }
                         }
-                        else
+                        else if (status == HTTP_REQUESTED_RANGE_NOT_SATISFIABLE)
                         {
-                                worker->setGetStatus(status, reason);
-//                              llwarns << status << ": " << reason << llendl;
+                                LL_DEBUGS("TextureFetch") << "Request was an unsatisfiable range: mRequestedSize=" << mRequestedSize << " mOffset=" << mOffset << " for: " << mID << LL_ENDL;
+                                unsatisfiable = true;
                         }
+
                         if (!success)
                         {
                                 worker->setGetStatus(status, reason);
 //                              llwarns << "CURL GET FAILED, status:" << status << " reason:" << reason << llendl;
                         }
                         mFetcher->removeFromHTTPQueue(mID);
-                        worker->callbackHttpGet(channels, buffer, partial, success);
+                        worker->callbackHttpGet(channels, buffer, partial, unsatisfiable, success);
                 }
                 else
                 {
@@ -870,6 +872,16 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                         return false;
                                 }
                         }
+
+                        // *TODO: remove this hack when not needed anymore
+                        S32 buggy_range_fudge = 0;
+                        if (LLTextureFetch::hasBuggyHTTPRange())
+                        {
+                                buggy_range_fudge = 1;
+                                resetFormattedData(); // discard any previous data we had
+                                cur_size = 0 ;
+                        }
+
                         mRequestedSize = mDesiredSize;
                         mRequestedDiscard = mDesiredDiscard;
                         mRequestedSize -= cur_size;
@@ -883,10 +895,11 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                 mLoaded = FALSE;
                                 mGetStatus = 0;
                                 mGetReason.clear();
-                                lldebugs << "HTTP GET: " << mID << " Offset: " << offset
+                                LL_DEBUGS("TextureFetch") << "HTTP GET: " << mID << " Offset: " << offset
                                                 << " Bytes: " << mRequestedSize
+                                                << " Range: " << offset << "-" << offset+mRequestedSize-1+buggy_range_fudge
                                                 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << max_bandwidth
-                                                << llendl;
+                                                << LL_ENDL;
                                 setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
                                 mState = WAIT_HTTP_REQ; 
 
@@ -894,7 +907,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                                 // Will call callbackHttpGet when curl request completes
                                 std::vector<std::string> headers;
                                 headers.push_back("Accept: image/x-j2c");
-                                res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize,
+                                res = mFetcher->mCurlGetRequest->getByteRange(mUrl, headers, offset, mRequestedSize + buggy_range_fudge,
                                                                                                                           new HTTPGetResponder(mFetcher, mID, LLTimer::getTotalTime(), mRequestedSize, offset));
                         }
                         if (!res)
@@ -1301,7 +1314,9 @@ bool LLTextureFetchWorker::processSimulatorPackets()
 
 void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
                                                                                    const LLIOPipe::buffer_ptr_t& buffer,
-                                                                                   bool last_block, bool success)
+                                                                                   bool partial,
+                                                                                   bool unsatisfiable,
+                                                                                   bool success)
 {
         LLMutexLock lock(&mWorkMutex);
 
@@ -1316,56 +1331,91 @@ void LLTextureFetchWorker::callbackHttpGet(const LLChannelDescriptors& channels,
                 llwarns << "Duplicate callback for " << mID.asString() << llendl;
                 return; // ignore duplicate callback
         }
+        
+        S32 data_size = 0;
         if (success)
         {
                 // get length of stream:
-                S32 data_size = buffer->countAfter(channels.in(), NULL);
+                data_size = buffer->countAfter(channels.in(), NULL);
 
                 gImageList.sTextureBits += data_size * 8; // Approximate - does not include header bits
         
-                //llinfos << "HTTP RECEIVED: " << mID.asString() << " Bytes: " << data_size << llendl;
+                LL_DEBUGS("TextureFetch") << "HTTP RECEIVED: " << mID.asString() << " Bytes: " << data_size << " mRequestedSize: " << mRequestedSize << LL_ENDL;
+
                 if (data_size > 0)
                 {
-                        // *TODO: set the formatted image data here directly to avoid the copy
-                        mBuffer = new U8[data_size];
-                        buffer->readAfter(channels.in(), NULL, mBuffer, data_size);
-                        mBufferSize += data_size;
-                        if (data_size < mRequestedSize &&
-                                (mRequestedDiscard == 0 || mRequestedSize >= MAX_IMAGE_DATA_SIZE) )
+                        bool clean_data = false;
+                        bool done = false;
+                        if (!partial)
                         {
-                                // We requested whole image (by discard or by size,) so assume we got it
-                                mHaveAllData = TRUE;
+                                // we got the whole image in one go
+                                done = true;
+                                clean_data = true;
+                        }
+                        else if (data_size < mRequestedSize)
+                        {
+                                // we have the whole image
+                                done = true;
+                        }
+                        else if (data_size == mRequestedSize)
+                        {
+                                if (mRequestedDiscard <= 0)
+                                {
+                                        done = true;
+                                }
+                                else
+                                {
+                                        // this is the normal case where we get the data we requested,
+                                        // but still need to request more data.
+                                }
                         }
                         else if (data_size > mRequestedSize)
                         {
                                 // *TODO: This shouldn't be happening any more
                                 llwarns << "data_size = " << data_size << " > requested: " << mRequestedSize << llendl;
-                                mHaveAllData = TRUE;
+                                done = true;
+                                clean_data = true;
                                 llassert_always(mDecodeHandle == 0);
-                                mFormattedImage = NULL; // discard any previous data we had
-                                mBufferSize = data_size;
                         }
-                        mRequestedSize = data_size;
-                }
-                else
-                {
-                        // We requested data but received none (and no error),
-                        if (mFormattedImage.notNull() && mFormattedImage->getDataSize() > 0)
+                        
+                        if (clean_data)
                         {
-                                // but have earlier data, so presumably we have it all.
-                                mRequestedSize = 0;
-                                mHaveAllData = TRUE;
+                                resetFormattedData(); // discard any previous data we had
+                                llassert(mBufferSize == 0);
                         }
-                        else
+                        if (done)
                         {
-                                mRequestedSize = -1;    // treat this fetch as if it failed.
+                                mHaveAllData = TRUE;
+                                mRequestedDiscard = 0;
                         }
+                        
+                        // *TODO: set the formatted image data here directly to avoid the copy
+                        mBuffer = new U8[data_size];
+                        buffer->readAfter(channels.in(), NULL, mBuffer, data_size);
+                        mBufferSize += data_size;
+                        mRequestedSize = data_size;
                 }
         }
         else
         {
                 mRequestedSize = -1; // error
         }
+
+        if ((success && (data_size == 0)) || unsatisfiable)
+        {
+                if (mFormattedImage.notNull() && mFormattedImage->getDataSize() > 0)
+                {
+                        // we already have some data, so we'll assume we have it all
+                        mRequestedSize = 0;
+                        mRequestedDiscard = 0;
+                        mHaveAllData = TRUE;
+                }
+                else
+                {
+                        mRequestedSize = -1;    // treat this fetch as if it failed.
+                }
+        }
+
         mLoaded = TRUE;
         setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
 }
@@ -2220,3 +2270,44 @@ void LLTextureFetch::dump()
         }
 }
 
+// This tries to detect if the sim has this bug:
+// http://opensimulator.org/mantis/view.php?id=5081
+//
+// *TODO: This is a *HACK and may not work if the grid is heterogenous.
+//        Remove it once OpenSim versions in the wild are > 0.7.0.2!
+#include "hippoGridManager.h"
+#include <boost/regex.hpp> 
+//static
+bool LLTextureFetch::hasBuggyHTTPRange()
+{
+        static std::string s_version;
+        static bool buggy = false;
+        if ((s_version != gLastVersionChannel) && !gLastVersionChannel.empty())
+        {
+                s_version = gLastVersionChannel;
+                buggy = false;
+                if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_OPENSIM)
+                {
+                        std::string ver_string;
+                        try
+                        {
+                                const boost::regex re(".*OpenSim.*?([0-9.]+).+");
+                                ver_string = regex_replace(s_version, re, "\\1", boost::match_default);
+                        }
+                        catch(std::runtime_error)
+                        {
+                                ver_string = "0.0";
+                        }
+                        LLStringUtil::replaceChar(ver_string, '.', '0');
+                        ver_string = "0." + ver_string;
+                        F64 version = atof(ver_string.c_str());
+                        // we look for "0.6.8" < version < "0.7.0.3"
+                        if ((version > 0.00608) && (version < 0.0070003))
+                        {
+                                buggy = true;
+                                llwarns << "Setting buggy http ranges mode for current sim, because we're on " << s_version << llendl;
+                        }
+                }
+        }
+        return buggy;
+}
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 6c6bb52..5fa2d1c 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -86,6 +86,8 @@ public:
 
         LLTextureInfo* getTextureInfo() { return &mTextureInfo; }
         
+        static bool hasBuggyHTTPRange(); // *TODO: remove this *HACK once buggy OpenSim versions are gone
+
 protected:
         void addToNetworkQueue(LLTextureFetchWorker* worker);
         void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel);
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 76a2761..f039ade 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5142,12 +5142,6 @@ void LLVOAvatar::updateTextures()
                                 if (texture_dict->mIsLocalTexture)
                                 {
                                         addLocalTextureStats((ETextureIndex)index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]);
-                                        // SNOW-8 : temporary snowglobe1.0 fix for baked textures
-                                        if (render_avatar && !gGLManager.mIsDisabled )
-                                        {
-                                                // bind the texture so that its boost level won't be slammed
-                                                gGL.getTexUnit(0)->bind(imagep);
-                                        }
                                 }
                                 else if (texture_dict->mIsBakedTexture)
                                 {
@@ -5184,8 +5178,14 @@ void LLVOAvatar::addLocalTextureStats( ETextureIndex idx, LLViewerImage* imagep,
                         F32 desired_pixels;
                         if( mIsSelf )
                         {
-                                desired_pixels = llmin(mPixelArea, (F32)TEX_IMAGE_AREA_SELF );
+                                desired_pixels = llmax(mPixelArea, (F32)TEX_IMAGE_AREA_SELF );
                                 imagep->setBoostLevel(LLViewerImageBoostLevel::BOOST_AVATAR_SELF);
+                                // SNOW-8 : temporary snowglobe1.0 fix for baked textures
+                                if (render_avatar && !gGLManager.mIsDisabled )
+                                {
+                                        // bind the texture so that its boost level won't be slammed
+                                        gGL.getTexUnit(0)->bind(imagep);
+                                }
                         }
                         else
                         {
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/de/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index 4dd9fd6..f49fcca 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_lagmeter" title="Lag-Anzeige">
-        <button name="client_lagmeter" tool_tip="Client-Lag-Status" />
+        <button name="client_lagmeter" tool_tip="Lag-Status Client" />
         <text name="client">
                 Client:
         </text>
@@ -14,7 +14,7 @@
         <text name="network_text">
                 Normal
         </text>
-        <button name="server_lagmeter" tool_tip="Server-Lag-Status" />
+        <button name="server_lagmeter" tool_tip="Lag-Status Server" />
         <text name="server">
                 Server:
         </text>
@@ -27,7 +27,7 @@
                 Lag-Anzeige
         </text>
         <text name="max_width_px">
-                350
+                360
         </text>
         <text name="min_title_msg">
                 Lag
@@ -48,10 +48,10 @@
                 Normal, Fenster im Hintergrund
         </text>
         <text name="client_frame_time_critical_msg">
-                Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
+                Frame-Rate Client unter [CLIENT_FRAME_RATE_CRITICAL]
         </text>
         <text name="client_frame_time_warning_msg">
-                Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
+                Frame-Rate Client zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
         </text>
         <text name="client_frame_time_normal_msg">
                 Normal
@@ -117,10 +117,10 @@
                 20
         </text>
         <text name="server_frame_time_critical_msg">
-                Simulator-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
+                Frame-Rate Simulator liegt unter [SERVER_FRAME_RATE_CRITICAL]
         </text>
         <text name="server_frame_time_warning_msg">
-                Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
+                Frame-Rate Simulator liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
         </text>
         <text name="server_frame_time_normal_msg">
                 Normal
diff --git a/linden/indra/newview/skins/default/xui/de/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/de/floater_local_asset_browse.xml
new file mode 100644
index 0000000..45a19ba
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_local_asset_browse.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Local Asset Browser: xui -->
+<!-- floater definition start -->
+
+<floater
+        name="local_bitmap_browser_floater"
+        title="Lokal Textur-Eigenschaften"
+        >
+
+  <button
+    name="add_btn"
+    label="Hinzufügen"
+                />
+  <button
+                name="del_btn"
+                label="Entfernen"
+                />
+  <button
+    name="upload_btn"
+    label="Bild hochladen ([UPLOADFEE])..."
+                />
+  
+  <scroll_list
+    name="bitmap_list"
+                >
+    <column name="bitmap_name" label="Name" dynamicwidth="true" />
+    <column name="bitmap_uuid" label="UUID" width="240" />
+  </scroll_list>
+  
+  <text name="path_caption_text"
+          >
+    Lokaler Pfad:
+  </text>
+
+  <text name="uuid_caption_text"
+          >
+    Lokale UUID:
+  </text>
+
+  <texture_picker
+    label="Textur"
+    name="texture_view"
+    />
+
+  <check_box
+    label="Aktualisierungscheck"
+    name="keep_updating_checkbox"
+    tool_tip="Periodische Checks ein- oder ausschalten, ob die Quelle auf der Festplatte aktualisiert wurde"
+    />
+
+  <combo_box
+    name="type_combobox"
+    >
+
+    <combo_item name="type_texture" value="type_texture">
+      Textur
+    </combo_item>
+
+    <combo_item name="type_sculptie" value="type_sculptie">
+      Sculptmap
+    </combo_item>
+
+    <combo_item name="type_layer" value="type_layer">
+      Kleidung
+    </combo_item>
+
+  </combo_box>
+
+  <text name="time_caption_text"
+          >
+    Zeit:
+  </text>
+
+  <text name="time_text"
+    >
+    (Hier Datum)
+  </text>
+
+  <text name="link_caption_text"
+          >
+    Link:
+  </text>
+
+  <text name="link_text"
+    >
+    (Linkstatus)
+  </text>
+
+  <text name="name_caption_text"
+        >
+    Name:
+  </text>
+
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
index ee25321..3bc231a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -6,13 +6,17 @@
                         <button label="Weiter" name="forward" />
                         <button label="Neu laden" name="reload" />
                         <button label="Los" name="go" />
+                        <button label="Zuhause" name="home" />
                 </layout_panel>
                 <layout_panel name="parcel_owner_controls">
+                        <web_browser name="browser" />
                         <button label="Aktuelle URL an Parzelle senden" name="assign" />
                 </layout_panel>
                 <layout_panel name="external_controls">
                         <button label="In meinem Browser öffnen" name="open_browser" />
                         <check_box label="Immer in meinem Browser öffnen" name="open_always" />
+                        <button label="Als Zuhause setzen" name="set_home" />
+
                         <button label="Schließen" name="close" />
                 </layout_panel>
         </layout_stack>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml
index d389258..232ec3e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mini_map.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="minimap">
+<floater name="minimap" short_title="Mini-Karte">
         <panel label="Minikarte" name="mini_mapview" tool_tip="(Karte mit Doppelklick öffnen)"/>
+  <!-- Note: panel contents are defined in panel_radar.xml -->
+  <panel name="RadarPanel" label="Radar" />
+  <button name="toggle_radar" label="" tool_tip="Radar anzeigen oder verstecken" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mute.xml b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
index 5dbb9fc..b39c97a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Stummgeschaltete Einwohner und Objekte" short_title="Stummschalten-Liste">
-        <scroll_list name="mutes" tool_tip="List of currently muted residents" />
+<floater name="mute floater" title="Stummgeschaltete Einwohner &amp; Objekte" short_title="Stummschalten-Liste">
+        <scroll_list name="mutes" tool_tip="Liste derzeit stummgeschalteter Einwohner" />
         <button label="Einwohner stummschalten..." label_selected="Einwohner stummschalten..."
              name="Mute resident..."
              tool_tip="Wählen Sie einen Einwohner, um ihn stumm zu schalten" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
index 60c6ff0..bf6059f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute_object.xml
@@ -2,7 +2,7 @@
 <floater name="mute by name" title="Objekt nach Name stummschalten">
         <text name="message">
                 Stummschalten nach Name betrifft nur Chat und IM, keine
-Sounds. Sie müssen den Objektnamen exakt angeben.
+Klänge. Sie müssen den Objektnamen exakt eingeben.
         </text>
         <line_editor name="object_name">
                 Objektname
diff --git a/linden/indra/newview/skins/default/xui/de/floater_name_description.xml b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
index f45b1e0..608c3eb 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
@@ -7,5 +7,5 @@
                 Beschreibung:
         </text>
         <button label="Abbrechen" name="cancel_btn" width="80" />
-        <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="120" />
+        <button label="Hochladen ([UPLOADFEE])" name="ok_btn" width="120" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
index 73c6760..dbb96ef 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
@@ -16,6 +16,9 @@
         <check_box label="Unterhemd" name="checkbox_Undershirt" left="90"/>
         <check_box label="Unterhose" name="checkbox_Underpants" left="90"/>
         <check_box label="Rock" name="checkbox_Skirt" left="90"/>
+        <check_box label="Tätowierung" name="checkbox_Tattoo" left="90"/>
+        <check_box label="Transparenz" name="checkbox_Alpha" left="90"/>
+
         <check_box label="Brust" name="checkbox_Chest" left="190"/>
         <check_box label="Schädel" name="checkbox_Skull" left="190"/>
         <check_box label="Linke Schulter" name="checkbox_Left Shoulder" left="190"/>
@@ -59,9 +62,8 @@
         </text>
         <text type="string" length="1"
              name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
-                Outfits sind Ordner, die Kleider und Körperteile enthalten.
-Ziehen Sie einen Outfit-Ordner auf Ihren Avatar, um ihn anzuziehen.
- 
+                 Outfits sind Ordner, die Kleidung und Körperteile enthalten. Ziehen Sie einen Outfit-Ordner auf Ihren Avatar, um ihn anzuziehen.
+
 „Neues Outfit“ erstellt einen neuen Ordner und speichert darin Kopien der
 Objekte, die Sie gerade tragen.
         </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml
index a1cd698..14318dd 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_notifications_console.xml
@@ -2,4 +2,7 @@
 <floater name="notifications_console" title="Konsole: Meldungen">
         <combo_box label="Meldungsart auswählen" name="notification_types" width="412" />
         <button label="Hinzufügen" name="add_notification" left="417" width="78" />
+  <button name="reload_notifications" left="497" width="85" label="Alle Neuladen"/>
+  <layout_stack name="notification_channels">
+  </layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay.xml b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
index dc38697..a98894d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay.xml
@@ -5,10 +5,10 @@
                 Schnellzahlung:
         </text>
 
-        <button name="fastpay 1"  label="1 L$"  left="115" />
-        <button name="fastpay 5"  label="5 L$"             />
-        <button name="fastpay 10" label="10 L$" left="115" />
-        <button name="fastpay 20" label="20 L$"            />
+        <button name="fastpay 1"  label="1 [CURRENCY]"  left="115" />
+        <button name="fastpay 5"  label="5 [CURRENCY]"             />
+        <button name="fastpay 10" label="10 [CURRENCY]" left="115" />
+        <button name="fastpay 20" label="20 [CURRENCY]"            />
 
         <text name="amount text">
                 Betrag:
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 55ad735..07dee37 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money">
+<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST>
 
         <string name="pay group">
                 Gruppe bezahlen:
@@ -16,14 +16,17 @@
                 Schnellzahlung:
         </text>
 
-        <button name="fastpay 1"  label="1 L$"  left="115" />
-        <button name="fastpay 5"  label="5 L$"             />
-        <button name="fastpay 10" label="10 L$" left="115" />
-        <button name="fastpay 20" label="20 L$"            />
+        <button name="fastpay 1"  label="1 [CURRENCY]"  left="115" />
+        <button name="fastpay 5"  label="5 [CURRENCY]"             />
+        <button name="fastpay 10" label="10 [CURRENCY]" left="115" />
+        <button name="fastpay 20" label="20 [CURRENCY]"            />
 
         <text name="amount text">
                 Betrag:
         </text>
+        <text name="currency text">
+                [CURRENCY]
+        </text>
 
         <button name="pay btn"    label="Zahlen"    />
         <button name="cancel btn" label="Abbrechen" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_post_process.xml b/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
index e10806d..4baad69 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_post_process.xml
@@ -32,16 +32,16 @@
                                 Rauschen-Stärke
                         </text>
                 </panel>
-                <panel label="Bloom" name="wmiBloomPanel">
+                <panel label="Schleier" name="wmiBloomPanel">
                         <check_box label="Ein" name="wmiBloomToggle" />
                         <text name="wmiBloomExtractText">
                                 Luminanz-Extraktion
                         </text>
                         <text name="wmiBloomSizeText">
-                                Bloom-Größe
+                                Schleier-Größe
                         </text>
                         <text name="wmiBloomStrengthText">
-                                Bloom-Stärke
+                                Schleier-Stärke
                         </text>
                 </panel>
                 <panel label="Extras" name="Extras">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_postcard.xml b/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
index 639a8ff..90a3c3d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_postcard.xml
@@ -22,18 +22,11 @@
         <text_editor name="msg_form">
                 Nachricht hier eingeben.
         </text_editor>
-        <check_box label="Im Web veröffentlichen" name="allow_publish_check"
-             tool_tip="Veröffentlicht diese Postkarte im Web." />
-        <check_box label="Ab-18-Inhalt" name="mature_check"
-             tool_tip="Diese Postkarte enthält nicht jugendfreie Inhalte." />
-        <button label="?" name="publish_help_btn" />
-        <text name="fine_print">
-                Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
-        </text>
+
         <button label="Abbrechen" name="cancel_btn" />
         <button label="Senden" name="send_btn" />
         <text name="default_subject">
-                Postkarte aus Second Life.
+                Postkarte aus [GRID_NAME].
         </text>
         <text name="default_message">
                 Sehen Sie hier!
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preferences.xml b/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
index 5f68282..ac18f28 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Einstellungen">
+<floater name="Preferences" title="Voreinstellungen">
         <button label="OK" label_selected="OK" name="OK" />
         <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
         <button label="Übernehmen" label_selected="Übernehmen" name="Apply" />
-        <button label="Info" label_selected="Info" name="About..." />
         <button label="Hilfe" label_selected="Hilfe" name="Help" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
index 370f242..7925ed6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
@@ -1,16 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="preview notecard" title="Hinweis:">
-        <button label="Speichern" label_selected="Speichern" name="Save" />
         <text type="string" length="1" name="desc txt">
                 Beschreibung:
         </text>
+
+        <menu_bar name="motecard_menu">
+    <menu name="File">
+      <menu_item_call label="Speichern" name="Save Menu" shortcut="control|S" />
+      <menu_item_separator />
+      <menu_item_call label="Text Exportieren..." name="Export Text..." />
+      <menu_item_call label="Text Importieren..." name="Import Text..." />
+    </menu>
+                <menu name="Edit">
+                        <menu_item_call label="Rückgängig" name="Undo" />
+                        <menu_item_call label="Wiederherstellen" name="Redo" width="139" />
+                        <menu_item_separator label="-----------" name="separator1" width="139" />
+                        <menu_item_call label="Ausschneiden" name="Cut" />
+                        <menu_item_call label="Kopieren" name="Copy" />
+                        <menu_item_call label="Einfügen" name="Paste" />
+                        <menu_item_separator label="-----------" name="separator2" width="139" />
+                        <menu_item_call label="Alle auswählen" name="Select All" width="139" />
+                        <menu_item_call label="Deselektieren" name="Deselect" width="139" />
+                        <menu_item_separator label="-----------" name="separator3" width="139" />
+                        <menu_item_call label="Suchen / Ersetzen..."
+                             name="Search / Replace..." width="139" />
+                </menu>
+        </menu_bar>
+
         <text_editor type="string" length="1" name="Notecard Editor">
                 Wird geladen...
         </text_editor>
-        <text name="no_object">
+        <button label="Sichern" label_selected="Sichern" name="Save" />
+        <string name="no_object">
                 Es wurde kein Objekt gefunden, das diese Notiz enthält.
-        </text>
-        <text name="not_allowed">
+        </string>
+        <string name="not_allowed">
                 Sie können diese Notiz nicht anzeigen.
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
index 1faf82b..7d068fe 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_notecard_keep_discard.xml
@@ -1,16 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_notecard">
-        <text_editor type="string" length="1" name="Notecard Editor">
-                Wird geladen...
-        </text_editor>
+<floater name="preview_notecard" title="Notiz:" >
         <text type="string" length="1" name="desc txt">
                 Beschreibung:
         </text>
+        <menu_bar name="motecard_menu">
+    <menu name="File">
+      <menu_item_call label="Sichern" name="Save Menu" />
+      <menu_item_separator />
+      <menu_item_call label="Text Exportieren..." name="Export Text..." />
+      <menu_item_call label="Text Importieren..." name="Import Text..." />
+    </menu>
+                <menu name="Edit">
+                        <menu_item_call label="Rückgängig" name="Undo" width="139" />
+                        <menu_item_call label="Wiederherstellen" name="Redo" width="139" />
+                        <menu_item_separator label="-----------" name="separator1" width="139" />
+                        <menu_item_call label="Ausschneiden" name="Cut" width="139" />
+                        <menu_item_call label="Kopieren" name="Copy" width="139" />
+                        <menu_item_call label="Einfügen" name="Paste" width="139" />
+                        <menu_item_separator label="-----------" name="separator2" width="139" />
+                        <menu_item_call label="Alle auswählen" name="Select All" width="139" />
+                        <menu_item_call label="Deselektieren" name="Deselect" width="139" />
+                        <menu_item_separator label="-----------" name="separator3" width="139" />
+                        <menu_item_call label="Suchen / Ersetzen..."
+                             name="Search / Replace..." width="139" />
+                </menu>
+        </menu_bar>
+        <text_editor type="string" length="1" name="Notecard Editor">
+                Wird geladen...
+        </text_editor>
         <button label="Behalten" label_selected="Behalten" name="Keep" />
+        <button label="Sichern" label_selected="Sichern" name="Save" />
         <button label="Verwerfen" label_selected="Verwerfen" name="Discard" />
-        <text name="no_object">
-                Es wurde kein Objekt gefunden, das diese Notiz enthält:
-        </text>
+        <string name="no_object">
+                Es wurde kein Objekt gefunden, das diese Notiz enthält.
+        </string>
         <string name="not_allowed">
                 Sie können diese Notiz nicht anzeigen.
         </string>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
index fd0a824..64e3e56 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_sound.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_sound">
+<floater name="preview_sound" width="310">
         <text type="string" length="1" name="desc txt">
                 Beschreibung:
         </text>
@@ -8,5 +8,5 @@
              tool_tip="Gibt diesen Sound so wieder, dass andere ihn hören können." />
         <button label="Lokal wiedergeben" label_selected="Lokal wiedergeben"
              name="Sound audition btn"
-             tool_tip="Gibt diesen Sound so wieder, dass nur Sie ihn hören." />
+             tool_tip="Gibt diesen Sound so wieder, dass nur Sie ihn hören." width="130" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/de/floater_prim_import.xml
new file mode 100644
index 0000000..0e5c6b1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_prim_import.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Import" title="Fortschritt des Imports">
+  <text name="name_label"> Fortschritt </text>  
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index 6a7246d..048066e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -119,6 +119,7 @@ dann auf das Objekt:
                 <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
                         Unanständigkeit &gt; Anstößige Inhalte oder Handlungen in der Öffentlichkeit
                 </combo_item>
+<!--  58 = deprecated by AO -->
                 <combo_item name="Indecency__Inappropriate_avatar_name">
                         Unanständigkeit &gt; Anstößiger Avatarname
                 </combo_item>
@@ -138,7 +139,7 @@ dann auf das Objekt:
                         Intoleranz
                 </combo_item>
                 <combo_item name="Land__Abuse_of_sandbox_resources">
-                        Land &gt; Missbrauch der Sandbox-Ressourcen
+                        Land &gt; Missbrauch von Sandbox-Ressourcen
                 </combo_item>
                 <combo_item name="Land__Encroachment__Objects_textures">
                         Land &gt; Unbefugte Nutzung &gt; Objekte/Texturen
@@ -160,7 +161,7 @@ dann auf das Objekt:
                 Name des Beschuldigten:
         </text>
         <button label="Einwohner auswählen" label_selected="" name="select_abuser" tool_tip="Den Namen des Beschuldigten aus einer Liste wählen"/>
-        <check_box label="Name des Täters ist nicht bekannt" name="omit_abuser_name" tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters unbekannt ist"/>
+        <check_box label="Name des Täters unbekannt" name="omit_abuser_name" tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters nicht bekannt ist"/>
         <text name="abuser_name_title2">
                 Ort des Missbrauchs:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
index 2c8734e..fdcde20 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="bug_reporter" title="Fehler melden">
+        <texture_picker label="" name="screenshot"/>
+        <check_box bottom_delta="-20" label="Screenshot einschließen" name="screen_check"/>
         <text name="reporter_title">
                 Melder:
         </text>
@@ -24,13 +26,11 @@ dann auf das Objekt:
         <text name="owner_name_label">
                 Eigentümer:
         </text>
-        <check_box label="Screenshot einschließen" name="screen_check" />
-        <texture_picker label="Arbeitet..." name="screenshot" />
         <text name="owner_name">
                 Hendrerit Vulputate
         </text>
         <combo_box name="category_combo"
-             tool_tip="Category -- select the category that best describes this report">
+             tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
                 <combo_item name="Selectcategory">
                         Kategorie auswählen
                 </combo_item>
@@ -74,7 +74,7 @@ dann auf das Objekt:
                         Skript
                 </combo_item>
                 <combo_item name="Sound">
-                        Sound
+                        Klang
                 </combo_item>
                 <combo_item name="Stipends">
                         Stipendium
diff --git a/linden/indra/newview/skins/default/xui/de/floater_rlv_behaviour.xml b/linden/indra/newview/skins/default/xui/de/floater_rlv_behaviour.xml
new file mode 100644
index 0000000..a08d9b2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_rlv_behaviour.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="rlvBehaviours"
+     title="Active RLV-Beschränkungen">
+  <scroll_list name="behaviour_list">
+    <column label="Beschränkung" name="behaviour" />
+    <column label="Objektname" name="name" />
+  </scroll_list>
+</floater>
\ No newline at end of file
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 3e0a5fa..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"
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 47eea07..9c265d2 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>
 
@@ -7122,8 +7122,8 @@ Apply this region's settings? (&quot;Ignore&quot; will ignore all region setting
 
 <notification
  name="ChangeFont"
- icon="alertmodal.tga"
- type="alertmodal">
+ icon="notify.tga"
+ 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>