Merge pull request #3177 from secondlife/brad/develop-merge

ExtraFPS -> develop merge

Author: brad-linden

indra/lib/python/indra/util/llmanifest.py

@@ -637,7 +637,7 @@ def unpacked_finish(self):
             'vers':'_'.join(self.args['version'])}
         print("Creating unpacked file:", unpacked_file_name)
         # could add a gz here but that doubles the time it takes to do this step
-        tf = tarfile.open(self.src_path_of(unpacked_file_name), 'w:')
+        tf = tarfile.open(self.build_path_of(unpacked_file_name), 'w:')
         # add the entire installation package, at the very top level
         tf.add(self.get_dst_prefix(), "")
         tf.close()

indra/llcommon/tests/llprocess_test.cpp

@@ -1086,7 +1086,27 @@ namespace tut
             return false;
         }
 
-        std::list<LLSD> mHistory;
+        template <typename CALLABLE>
+        void checkHistory(CALLABLE&& code)
+        {
+            try
+            {
+                // we expect this lambda to contain tut::ensure() calls
+                std::forward<CALLABLE>(code)(mHistory);
+            }
+            catch (const failure&)
+            {
+                LL_INFOS() << "event history:" << LL_ENDL;
+                for (const LLSD& item : mHistory)
+                {
+                    LL_INFOS() << item << LL_ENDL;
+                }
+                throw;
+            }
+        }
+
+        using Listory = std::list<LLSD>;
+        Listory mHistory;
         LLTempBoundListener mConnection;
     };
 
@@ -1137,23 +1157,26 @@ namespace tut
         // finish out the run
         waitfor(*py.mPy);
         // now verify history
-        std::list<LLSD>::const_iterator li(listener.mHistory.begin()),
-                                        lend(listener.mHistory.end());
-        ensure("no events", li != lend);
-        ensure_equals("history[0]", (*li)["data"].asString(), "abc");
-        ensure_equals("history[0] len", (*li)["len"].asInteger(), 3);
-        ++li;
-        ensure("only 1 event", li != lend);
-        ensure_equals("history[1]", (*li)["data"].asString(), "abcdef");
-        ensure_equals("history[0] len", (*li)["len"].asInteger(), 6);
-        ++li;
-        ensure("only 2 events", li != lend);
-        ensure_equals("history[2]", (*li)["data"].asString(), "abcdefghi" EOL);
-        ensure_equals("history[0] len", (*li)["len"].asInteger(), 9 + sizeof(EOL) - 1);
-        ++li;
-        // We DO NOT expect a whole new event for the second line because we
-        // disconnected.
-        ensure("more than 3 events", li == lend);
+        listener.checkHistory(
+            [](const EventListener::Listory& history)
+            {
+                auto li(history.begin()), lend(history.end());
+                ensure("no events", li != lend);
+                ensure_equals("history[0]", (*li)["data"].asString(), "abc");
+                ensure_equals("history[0] len", (*li)["len"].asInteger(), 3);
+                ++li;
+                ensure("only 1 event", li != lend);
+                ensure_equals("history[1]", (*li)["data"].asString(), "abcdef");
+                ensure_equals("history[0] len", (*li)["len"].asInteger(), 6);
+                ++li;
+                ensure("only 2 events", li != lend);
+                ensure_equals("history[2]", (*li)["data"].asString(), "abcdefghi" EOL);
+                ensure_equals("history[0] len", (*li)["len"].asInteger(), 9 + sizeof(EOL) - 1);
+                ++li;
+                // We DO NOT expect a whole new event for the second line because we
+                // disconnected.
+                ensure("more than 3 events", li == lend);
+            });
     }
 
     template<> template<>
@@ -1173,14 +1196,17 @@ namespace tut
         // (or any other intervening layer) does crazy buffering. What we want
         // to ensure is that there was exactly ONE event with "eof" true, and
         // that it was the LAST event.
-        std::list<LLSD>::const_reverse_iterator rli(listener.mHistory.rbegin()),
-                                                rlend(listener.mHistory.rend());
-        ensure("no events", rli != rlend);
-        ensure("last event not \"eof\"", (*rli)["eof"].asBoolean());
-        while (++rli != rlend)
-        {
-            ensure("\"eof\" event not last", ! (*rli)["eof"].asBoolean());
-        }
+        listener.checkHistory(
+            [](const EventListener::Listory& history)
+            {
+                auto rli(history.rbegin()), rlend(history.rend());
+                ensure("no events", rli != rlend);
+                ensure("last event not \"eof\"", (*rli)["eof"].asBoolean());
+                while (++rli != rlend)
+                {
+                    ensure("\"eof\" event not last", ! (*rli)["eof"].asBoolean());
+                }
+            });
     }
 
     template<> template<>
@@ -1203,13 +1229,17 @@ namespace tut
         ensure_equals("getLimit() after setlimit(10)", childout.getLimit(), 10);
         // okay, pump I/O to pick up output from child
         waitfor(*py.mPy);
-        ensure("no events", ! listener.mHistory.empty());
-        // For all we know, that data could have arrived in several different
-        // bursts... probably not, but anyway, only check the last one.
-        ensure_equals("event[\"len\"]",
-                      listener.mHistory.back()["len"].asInteger(), abc.length());
-        ensure_equals("length of setLimit(10) data",
-                      listener.mHistory.back()["data"].asString().length(), 10);
+        listener.checkHistory(
+            [abc](const EventListener::Listory& history)
+            {
+                ensure("no events", ! history.empty());
+                // For all we know, that data could have arrived in several different
+                // bursts... probably not, but anyway, only check the last one.
+                ensure_equals("event[\"len\"]",
+                              history.back()["len"].asInteger(), abc.length());
+                ensure_equals("length of setLimit(10) data",
+                              history.back()["data"].asString().length(), 10);
+            });
     }
 
     template<> template<>
@@ -1276,18 +1306,22 @@ namespace tut
         params.postend = pumpname;
         LLProcessPtr child = LLProcess::create(params);
         ensure("shouldn't have launched", ! child);
-        ensure_equals("number of postend events", listener.mHistory.size(), 1);
-        LLSD postend(listener.mHistory.front());
-        ensure("has id", ! postend.has("id"));
-        ensure_equals("desc", postend["desc"].asString(), std::string(params.desc));
-        ensure_equals("state", postend["state"].asInteger(), LLProcess::UNSTARTED);
-        ensure("has data", ! postend.has("data"));
-        std::string error(postend["string"]);
-        // All we get from canned parameter validation is a bool, so the
-        // "validation failed" message we ourselves generate can't mention
-        // "executable" by name. Just check that it's nonempty.
-        //ensure_contains("error", error, "executable");
-        ensure("string", ! error.empty());
+        listener.checkHistory(
+            [&params](const EventListener::Listory& history)
+            {
+                ensure_equals("number of postend events", history.size(), 1);
+                LLSD postend(history.front());
+                ensure("has id", ! postend.has("id"));
+                ensure_equals("desc", postend["desc"].asString(), std::string(params.desc));
+                ensure_equals("state", postend["state"].asInteger(), LLProcess::UNSTARTED);
+                ensure("has data", ! postend.has("data"));
+                std::string error(postend["string"]);
+                // All we get from canned parameter validation is a bool, so the
+                // "validation failed" message we ourselves generate can't mention
+                // "executable" by name. Just check that it's nonempty.
+                //ensure_contains("error", error, "executable");
+                ensure("string", ! error.empty());
+            });
     }
 
     template<> template<>
@@ -1309,16 +1343,20 @@ namespace tut
         {
             yield();
         }
-        ensure("no postend event", i < timeout);
-        ensure_equals("number of postend events", listener.mHistory.size(), 1);
-        LLSD postend(listener.mHistory.front());
-        ensure_equals("id",    postend["id"].asInteger(), childid);
-        ensure("desc empty", ! postend["desc"].asString().empty());
-        ensure_equals("state", postend["state"].asInteger(), LLProcess::EXITED);
-        ensure_equals("data",  postend["data"].asInteger(),  35);
-        std::string str(postend["string"]);
-        ensure_contains("string", str, "exited");
-        ensure_contains("string", str, "35");
+        listener.checkHistory(
+            [i, timeout, childid](const EventListener::Listory& history)
+            {
+                ensure("no postend event", i < timeout);
+                ensure_equals("number of postend events", history.size(), 1);
+                LLSD postend(history.front());
+                ensure_equals("id",    postend["id"].asInteger(), childid);
+                ensure("desc empty", ! postend["desc"].asString().empty());
+                ensure_equals("state", postend["state"].asInteger(), LLProcess::EXITED);
+                ensure_equals("data",  postend["data"].asInteger(),  35);
+                std::string str(postend["string"]);
+                ensure_contains("string", str, "exited");
+                ensure_contains("string", str, "35");
+            });
     }
 
     struct PostendListener

indra/llinventory/llsettingssky.cpp

@@ -601,7 +601,7 @@ void LLSettingsSky::blend(LLSettingsBase::ptr_t &end, F64 blendf)
 
         mSettingFlags |= other->mSettingFlags;
 
-        mCanAutoAdjust = false; // no point?
+        mCanAutoAdjust = other->mCanAutoAdjust;
 
         mSunRotation = slerp((F32)blendf, mSunRotation, other->mSunRotation);
         mMoonRotation = slerp((F32)blendf, mMoonRotation, other->mMoonRotation);
@@ -1177,6 +1177,11 @@ void LLSettingsSky::loadValuesFromLLSD()
         mReflectionProbeAmbiance = (F32)settings[SETTING_REFLECTION_PROBE_AMBIANCE].asReal();
     }
 
+    mHDRMax = 2.0f;
+    mHDRMin = 0.5f;
+    mHDROffset = 1.0f;
+    mTonemapMix = 1.0f;
+
     mSunTextureId = settings[SETTING_SUN_TEXTUREID].asUUID();
     mMoonTextureId = settings[SETTING_MOON_TEXTUREID].asUUID();
     mCloudTextureId = settings[SETTING_CLOUD_TEXTUREID].asUUID();
@@ -2027,6 +2032,38 @@ F32 LLSettingsSky::getGamma() const
     return mGamma;
 }
 
+F32 LLSettingsSky::getHDRMin() const
+{
+    if (mCanAutoAdjust)
+        return 0.f;
+
+    return mHDRMin;
+}
+
+F32 LLSettingsSky::getHDRMax() const
+{
+    if (mCanAutoAdjust)
+        return 0.f;
+
+    return mHDRMax;
+}
+
+F32 LLSettingsSky::getHDROffset() const
+{
+    if (mCanAutoAdjust)
+        return 1.0f;
+
+    return mHDROffset;
+}
+
+F32 LLSettingsSky::getTonemapMix() const
+{
+    if (mCanAutoAdjust)
+        return 0.0f;
+
+    return mTonemapMix;
+}
+
 void LLSettingsSky::setGamma(F32 val)
 {
     mGamma = val;

indra/llinventory/llsettingssky.h

@@ -209,6 +209,11 @@ class LLSettingsSky: public LLSettingsBase
 
     F32 getGamma() const;
 
+    F32 getHDRMin() const;
+    F32 getHDRMax() const;
+    F32 getHDROffset() const;
+    F32 getTonemapMix() const;
+
     void setGamma(F32 val);
 
     LLColor3 getGlow() const;
@@ -380,6 +385,10 @@ class LLSettingsSky: public LLSettingsBase
     F32 mCloudVariance;
     F32 mCloudShadow;
     F32 mCloudScale;
+    F32 mTonemapMix;
+    F32 mHDROffset;
+    F32 mHDRMax;
+    F32 mHDRMin;
     LLVector2 mScrollRate;
     LLColor3 mCloudPosDensity1;
     LLColor3 mCloudPosDensity2;