diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index 6f7bd85699da135270517bb00a78659d265a20a6..915bc687d8d15d8e3108eb7145d9ae4147fa5c38 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -442,6 +442,21 @@ void LLFloaterFixedEnvironment::onInventoryUpdated(LLUUID asset_id, LLUUID inven
 }
 
 
+void LLFloaterFixedEnvironment::clearDirtyFlag()
+{
+    mIsDirty = false;
+
+    S32 count = mTab->getTabCount();
+
+    for (S32 idx = 0; idx < count; ++idx)
+    {
+        LLSettingsEditPanel *panel = static_cast<LLSettingsEditPanel *>(mTab->getPanelByIndex(idx));
+        if (panel)
+            panel->clearIsDirty();
+    }
+
+}
+
 void LLFloaterFixedEnvironment::doSelectFromInventory()
 {
     LLFloaterSettingsPicker *picker = getSettingsPicker();
diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h
index b610aef5f71f6a544a50a4c0a67ccb30f58adc74..85a9ba0141ababa7dff0e0d3f63f5d0324ca2e9a 100644
--- a/indra/newview/llfloaterfixedenvironment.h
+++ b/indra/newview/llfloaterfixedenvironment.h
@@ -103,7 +103,7 @@ class LLFloaterFixedEnvironment : public LLFloater
 
     bool                    getIsDirty() const  { return mIsDirty; }
     void                    setDirtyFlag()      { mIsDirty = true; }
-    virtual void            clearDirtyFlag()    { mIsDirty = false; }
+    virtual void            clearDirtyFlag();
 
     void                    doSelectFromInventory();
     void                    onPanelDirtyFlagChanged(bool);
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index d1dddf8e7e248a485a3c4c4aa8f7cf60cfd014b1..22b576eb224e9d361b3dbc0e6d396b96ebdbd776 100644
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -258,7 +258,7 @@ namespace tut
 					  std::string("https://login.aditi.lindenlab.com/cgi-bin/login.cgi"));
 		ensure_equals("Aditi helper uri",
 					  LLGridManager::getInstance()->getHelperURI("util.aditi.lindenlab.com"),
-					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
+					  std::string("https://aditi-secondlife.webdev.lindenlab.com/helpers/"));
 		ensure_equals("Aditi login page",
 					  LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
 					  std::string("https://viewer-splash.secondlife.com/"));
@@ -330,7 +330,7 @@ namespace tut
 					  std::string("https://login.aditi.lindenlab.com/cgi-bin/login.cgi"));
 		ensure_equals("Aditi helper uri",
 					  LLGridManager::getInstance()->getHelperURI("util.aditi.lindenlab.com"),
-					  std::string("http://aditi-secondlife.webdev.lindenlab.com/helpers/"));
+					  std::string("https://aditi-secondlife.webdev.lindenlab.com/helpers/"));
 		ensure_equals("Aditi login page",
 					  LLGridManager::getInstance()->getLoginPage("util.aditi.lindenlab.com"),
 					  std::string("https://viewer-splash.secondlife.com/"));