Merge branch 'cvpatches' into next

6 files changed, 75 insertions, 10 deletions

diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 2a911ba..56acf4c 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -455,6 +455,7 @@ PARCEL_FLAG_ALLOW_LANDMARK			Used with llGetParcelFlags to find if a parcel allo
 PARCEL_FLAG_ALLOW_TERRAFORM                     Used with llGetParcelFlags to find if a parcel allows anyone to terraform the land
 PARCEL_FLAG_ALLOW_DAMAGE                        Used with llGetParcelFlags to find if a parcel allows damage
 PARCEL_FLAG_ALLOW_CREATE_OBJECTS        Used with llGetParcelFlags to find if a parcel allows anyone to create objects
+PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS  Used with llGetParcelFlags to find if a parcel allows group members or objects to create objects
 PARCEL_FLAG_USE_ACCESS_GROUP            Used with llGetParcelFlags to find if a parcel limits access to a group
 PARCEL_FLAG_USE_ACCESS_LIST                     Used with llGetParcelFlags to find if a parcel limits access to a list of residents
 PARCEL_FLAG_USE_BAN_LIST                        Used with llGetParcelFlags to find if a parcel uses a ban list
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index fc2742f..b4f1a22 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -59,6 +59,7 @@
 #include "llfloaterchat.h"
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
+#include "llselectmgr.h"
 
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -194,7 +195,20 @@ BOOL LLFloaterScriptQueue::start()
 {
         //llinfos << "LLFloaterCompileQueue::start()" << llendl;
         std::string buffer;
-        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), mObjectIDs.count()); // *TODO: Translate
+
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        U32 n_objects = 0;
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        {
+                n_objects = selectHandle->getObjectCount();
+        }
+        else
+        {
+                n_objects = selectHandle->getRootObjectCount();
+        }
+
+        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
         
         LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
         list->addCommentText(buffer);
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5e4aafc..e058681 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -497,7 +497,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
         F32 dist_squared = 0.f;
         F32 camdist2 = (mDistanceWRTCamera * mDistanceWRTCamera);
 
-        if (damped && mDistanceWRTCamera > 0.0f)
+        if (damped && isVisible())
         {
                 F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
                 LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
@@ -521,11 +521,19 @@ F32 LLDrawable::updateXform(BOOL undamped)
                 {
                         // snap to final position
                         dist_squared = 0.0f;
+                        if (!isRoot())
+                        { //child prim snapping to some position, needs a rebuild
+                                gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+                        }
                 }
         }
 
         if ((mCurrentScale != target_scale) ||
-                (!isRoot() && (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || !mVObjp->getAngularVelocity().isExactlyZero()))
+                (!isRoot() && 
+                 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || 
+                 !mVObjp->getAngularVelocity().isExactlyZero() ||
+                 target_pos != mXform.getPosition() ||
+                 target_rot != mXform.getRotation()))
         { //child prim moving or scale change requires immediate rebuild
                 gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
         }
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index bbcfba6..1edfbe6 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -899,12 +899,41 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
 // static
 void LLFilePicker::add_to_selectedfiles(gpointer data, gpointer user_data)
 {
-        LLFilePicker* picker = (LLFilePicker*) user_data;
+        // We need to run g_filename_to_utf8 in the user's locale
+        std::string old_locale(setlocale(LC_ALL, NULL));
+        setlocale(LC_ALL, "");
+
+        LLFilePicker* picker = (LLFilePicker*) user_data;
+        GError *error = NULL;
         gchar* filename_utf8 = g_filename_to_utf8((gchar*)data,
-                                                  -1, NULL, NULL, NULL);
-        picker->mFiles.push_back(std::string(filename_utf8));
-        lldebugs << "ADDED FILE " << filename_utf8 << llendl;
-        g_free(filename_utf8);
+                                                  -1, NULL, NULL, &error);
+        if (error)
+        {
+                // This condition should really be notified to the user, e.g.,
+                // through a message box.  Just logging it is inapropriate.
+                // FIXME.
+                
+                // Ghhhh.  g_filename_display_name is new to glib 2.6, and it
+                // is too new for SL! (Note that the latest glib as of this
+                // writing is 2.22. *sigh*) LL supplied *makeASCII family are
+                // also unsuitable since they allow control characters...
+
+                std::string display_name;
+                for (const gchar *str = (const gchar *)data; *str; str++)
+                {
+                        display_name += (char)((*str >= 0x20 && *str <= 0x7E) ? *str : '?');
+                }
+                llwarns << "g_filename_to_utf8 failed on \"" << display_name << "\": " << error->message << llendl;
+        }
+
+        if (filename_utf8)
+        {
+                picker->mFiles.push_back(std::string(filename_utf8));
+                lldebugs << "ADDED FILE " << filename_utf8 << llendl;
+                g_free(filename_utf8);
+        }
+
+        setlocale(LC_ALL, old_locale.c_str());
 }
 
 // static
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 31fdcc3..486e4f1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5963,8 +5963,9 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
 {
         // Apply until an object fails
         QueueObjects func(q);
-        const bool firstonly = true;
-        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        bool fail = selectHandle->applyToObjects(&func);
         if(fail)
         {
                 if ( !func.scripted )
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 3523635..e7db166 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2665,6 +2665,18 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
         LLGLState::checkClientArrays();
         U32 last_type = 0;
         
+        // If we don't do this, we crash something on changing graphics settings
+        // from Medium -> Low, because we unload all the shaders and the 
+        // draw pools aren't aware.  I don't know if this has to be a separate
+        // loop before actual rendering. JC
+        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
+        {
+                LLDrawPool *poolp = *iter;
+                if (poolp->isFacePool() && hasRenderType(poolp->getType()))
+                {
+                        poolp->prerender();
+                }
+        }
         for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
         {
                 LLDrawPool *poolp = *iter;