1 files changed, 166 insertions, 26 deletions

diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 2f01844..8043fe0 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -52,10 +52,12 @@
 #include "llcheckboxctrl.h"
 #include "llcombobox.h"
 #include "llfilepicker.h"
+#include "llfloaterdaycycle.h"
 #include "llfloatergodtools.h"  // for send_sim_wide_deletes()
 #include "llfloatertopobjects.h" // added to fix SL-32336
 #include "llfloatergroups.h"
 #include "llfloatertelehub.h"
+#include "llfloaterwindlight.h"
 #include "lllineeditor.h"
 #include "llalertdialog.h"
 #include "llnamelistctrl.h"
@@ -214,7 +216,6 @@ BOOL LLFloaterRegionInfo::postBuild()
 
 LLFloaterRegionInfo::~LLFloaterRegionInfo()
 {
-        sInstance = NULL;
 }
 
 void LLFloaterRegionInfo::onOpen()
@@ -229,6 +230,7 @@ void LLFloaterRegionInfo::onOpen()
         LLFloater::onOpen();
 }
 
+// static
 void LLFloaterRegionInfo::requestRegionInfo()
 {
         // Must allow anyone to request the RegionInfo data
@@ -247,14 +249,17 @@ void LLFloaterRegionInfo::requestRegionInfo()
 void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
 {
         static LLDispatcher dispatch;
-        if(!sInstance) return;
-
+        if(!findInstance())
+        {
+                return;
+        }
+        
         if (!estate_dispatch_initialized)
         {
                 LLPanelEstateInfo::initDispatch(dispatch);
         }
 
-        LLTabContainerCommon* tab = LLUICtrlFactory::getTabContainerByName(sInstance, "region_panels");
+        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(findInstance(), "region_panels");
         if (!tab) return;
 
         LLPanelEstateInfo* panel = (LLPanelEstateInfo*)LLUICtrlFactory::getPanelByName(tab, "Estate");
@@ -282,8 +287,12 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
         LLPanel* panel;
 
         llinfos << "LLFloaterRegionInfo::processRegionInfo" << llendl;
-        if(!sInstance) return;
-        LLTabContainerCommon* tab = LLUICtrlFactory::getTabContainerByName(sInstance, "region_panels");
+        if(!findInstance())
+        {
+                return;
+        }
+        
+        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(findInstance(), "region_panels");
         if(!tab) return;
 
         // extract message
@@ -359,6 +368,8 @@ void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
         panel->childSetEnabled("fixed_sun_check", allow_modify && !use_estate_sun);
         panel->childSetValue("sun_hour_slider", LLSD(sun_hour));
         panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);
+
+        getInstance()->refreshFromRegion( gAgent.getRegion() );
 }
 
 // static
@@ -366,7 +377,7 @@ LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
 {
         LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
         if (!floater) return NULL;
-        LLTabContainerCommon* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
+        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
         if (!tab) return NULL;
         LLPanelEstateInfo* panel = (LLPanelEstateInfo*)LLUICtrlFactory::getPanelByName(tab,"Estate");
         return panel;
@@ -377,7 +388,7 @@ LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
 {
         LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
         if (!floater) return NULL;
-        LLTabContainerCommon* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
+        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
         if (!tab) return NULL;
         LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)LLUICtrlFactory::getPanelByName(tab, "Covenant");
         return panel;
@@ -450,6 +461,15 @@ void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)
         }
 }
 
+// static
+// Enables set button on change to line editor
+void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)
+{
+        // reuse the previous method
+        onChangeAnything(0, user_data);
+}
+
+
 // virtual
 BOOL LLPanelRegionInfo::postBuild()
 {
@@ -519,6 +539,12 @@ void LLPanelRegionInfo::initCtrl(const char* name)
         childSetCommitCallback(name, onChangeAnything, this);
 }
 
+void LLPanelRegionInfo::initTextCtrl(const char* name)
+{
+        childSetCommitCallback(name, onChangeAnything, this);
+        childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
+}
+
 void LLPanelRegionInfo::initHelpBtn(const char* name, const char* xml_alert)
 {
         childSetAction(name, onClickHelp, (void*)xml_alert);
@@ -1231,7 +1257,7 @@ BOOL LLPanelRegionTerrainInfo::sendUpdate()
         LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
         if (!floater) return true;
 
-        LLTabContainerCommon* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
+        LLTabContainer* tab = LLUICtrlFactory::getTabContainerByName(floater, "region_panels");
         if (!tab) return true;
 
         LLPanelEstateInfo* panel = (LLPanelEstateInfo*)LLUICtrlFactory::getPanelByName(tab, "Estate");
@@ -1412,9 +1438,21 @@ void LLPanelEstateInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
         }
 }
 
+
+
+
 //---------------------------------------------------------------------------
 // Add/Remove estate access button callbacks
 //---------------------------------------------------------------------------
+void LLPanelEstateInfo::onClickEditSky(void* user_data)
+{
+        LLFloaterWindLight::show();
+}
+
+void LLPanelEstateInfo::onClickEditDayCycle(void* user_data)
+{
+        LLFloaterDayCycle::show();
+}
 
 // static
 void LLPanelEstateInfo::onClickAddAllowedAgent(void* user_data)
@@ -1920,6 +1958,7 @@ bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
         childSetEnabled("remove_banned_avatar_btn",             god || owner || manager);
         childSetEnabled("message_estate_btn",                   god || owner || manager);
         childSetEnabled("kick_user_from_estate_btn",    god || owner || manager);
+        childSetEnabled("abuse_email_address",                  god || owner || manager);
 
         // estate managers can't add estate managers
         childSetEnabled("add_estate_manager_btn",               god || owner);
@@ -1980,16 +2019,21 @@ BOOL LLPanelEstateInfo::postBuild()
         initCtrl("limit_payment");
         initCtrl("limit_age_verified");
         initCtrl("voice_chat_check");
+        initTextCtrl("abuse_email_address");
 
         initHelpBtn("estate_manager_help",                      "HelpEstateEstateManager");
         initHelpBtn("use_global_time_help",                     "HelpEstateUseGlobalTime");
         initHelpBtn("fixed_sun_help",                           "HelpEstateFixedSun");
+        initHelpBtn("WLEditSkyHelp",                            "HelpEditSky");
+        initHelpBtn("WLEditDayCycleHelp",                       "HelpEditDayCycle");
+
         initHelpBtn("externally_visible_help",          "HelpEstateExternallyVisible");
         initHelpBtn("allow_direct_teleport_help",       "HelpEstateAllowDirectTeleport");
         initHelpBtn("allow_resident_help",                      "HelpEstateAllowResident");
         initHelpBtn("allow_group_help",                         "HelpEstateAllowGroup");
         initHelpBtn("ban_resident_help",                        "HelpEstateBanResident");
-        initHelpBtn("voice_chat_help", "HelpEstateVoiceChat");
+        initHelpBtn("abuse_email_address_help",         "HelpEstateAbuseEmailAddress");
+        initHelpBtn("voice_chat_help",                  "HelpEstateVoiceChat");
 
         // set up the use global time checkbox
         childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);
@@ -2042,6 +2086,9 @@ BOOL LLPanelEstateInfo::postBuild()
         childSetAction("message_estate_btn", onClickMessageEstate, this);
         childSetAction("kick_user_from_estate_btn", onClickKickUser, this);
 
+        childSetAction("WLEditSky", onClickEditSky, this);
+        childSetAction("WLEditDayCycle", onClickEditDayCycle, this);
+
         return LLPanelRegionInfo::postBuild();
 }
 
@@ -2086,8 +2133,19 @@ void LLPanelEstateInfo::callbackChangeLindenEstate(S32 option, void* data)
         {
         case 0:
                 // send the update
-                LLFloaterRegionInfo::nextInvoice();
-                self->commitEstateInfo();
+                if (!self->commitEstateInfoCaps())
+                {
+                        // the caps method failed, try the old way
+                        LLFloaterRegionInfo::nextInvoice();
+                        self->commitEstateInfoDataserver();
+                }
+                // we don't want to do this because we'll get it automatically from the sim
+                // after the spaceserver processes it
+//              else
+//              {
+//                      // caps method does not automatically send this info
+//                      LLFloaterRegionInfo::requestRegionInfo();
+//              }
                 break;
         case 1:
         default:
@@ -2125,12 +2183,75 @@ void LLPanelEstateInfo::getEstateOwner()
 }
 */
 
+class LLEstateChangeInfoResponder : public LLHTTPClient::Responder
+{
+public:
+        LLEstateChangeInfoResponder(void* userdata) : mpPanel((LLPanelEstateInfo*)userdata) {};
+        
+        // if we get a normal response, handle it here
+        virtual void result(const LLSD& content)
+        {
+            // refresh the panel from the database
+                mpPanel->refresh();
+        }
+        
+        // if we get an error response
+        virtual void error(U32 status, const std::string& reason)
+        {
+                llinfos << "LLEstateChangeInfoResponder::error "
+                        << status << ": " << reason << llendl;
+        }
+private:
+        LLPanelEstateInfo* mpPanel;
+};
+
+// tries to send estate info using a cap; returns true if it succeeded
+bool LLPanelEstateInfo::commitEstateInfoCaps()
+{
+        std::string url = gAgent.getRegion()->getCapability("EstateChangeInfo");
+        
+        if (url.empty())
+        {
+                // whoops, couldn't find the cap, so bail out
+                return false;
+        }
+        
+        LLSD body;
+        body["estate_name"] = getEstateName();
+
+        body["is_externally_visible"] = childGetValue("externally_visible_check").asBoolean();
+        body["allow_direct_teleport"] = childGetValue("allow_direct_teleport").asBoolean();
+        body["is_sun_fixed"         ] = childGetValue("fixed_sun_check").asBoolean();
+        body["deny_anonymous"       ] = childGetValue("limit_payment").asBoolean();
+        body["deny_age_unverified"  ] = childGetValue("limit_age_verified").asBoolean();
+        body["allow_voice_chat"     ] = childGetValue("voice_chat_check").asBoolean();
+        body["invoice"              ] = LLFloaterRegionInfo::getLastInvoice();
+
+        // block fly is in estate database but not in estate UI, so we're not supporting it
+        //body["block_fly"            ] = childGetValue("").asBoolean();
+
+        F32 sun_hour = getSunHour();
+        if (childGetValue("use_global_time_check").asBoolean())
+        {
+                sun_hour = 0.f;                 // 0 = global time
+        }
+        body["sun_hour"] = sun_hour;
+
+        body["owner_abuse_email"] = childGetValue("abuse_email_address").asString();
+
+        // we use a responder so that we can re-get the data after committing to the database
+        LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder((void*)this));
+    return true;
+}
+
+/* This is the old way of doing things, is deprecated, and should be 
+   deleted when the dataserver model can be removed */
 // key = "estatechangeinfo"
 // strings[0] = str(estate_id) (added by simulator before relay - not here)
 // strings[1] = estate_name
 // strings[2] = str(estate_flags)
 // strings[3] = str((S32)(sun_hour * 1024.f))
-void LLPanelEstateInfo::commitEstateInfo()
+void LLPanelEstateInfo::commitEstateInfoDataserver()
 {
         LLMessageSystem* msg = gMessageSystem;
         msg->newMessage("EstateOwnerMessage");
@@ -2174,7 +2295,6 @@ void LLPanelEstateInfo::setEstateFlags(U32 flags)
         childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );
         childSetValue("limit_payment", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );
         childSetValue("limit_age_verified", LLSD(flags & REGION_FLAGS_DENY_AGEUNVERIFIED ? TRUE : FALSE) );
-        childSetVisible("abuse_email_text", flags & REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER);
 
         refresh();
 }
@@ -2277,6 +2397,16 @@ void LLPanelEstateInfo::setOwnerName(const std::string& name)
         childSetValue("estate_owner", LLSD(name));
 }
 
+const std::string LLPanelEstateInfo::getAbuseEmailAddress() const
+{
+        return childGetValue("abuse_email_address").asString();
+}
+
+void LLPanelEstateInfo::setAbuseEmailAddress(const std::string& address)
+{
+        childSetValue("abuse_email_address", LLSD(address));
+}
+
 void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent,
                                                                                                 bool enable_group,
                                                                                                 bool enable_ban)
@@ -2439,35 +2569,35 @@ LLPanelEstateCovenant::LLPanelEstateCovenant()
 // virtual 
 bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
 {
-        LLTextBox* region_name = (LLTextBox*)getChildByName("region_name_text");
+        LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
         if (region_name)
         {
                 region_name->setText(region->getName());
         }
 
-        LLTextBox* resellable_clause = (LLTextBox*)getChildByName("resellable_clause");
+        LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
         if (resellable_clause)
         {
                 if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
                 {
-                        resellable_clause->setText(childGetText("can_not_resell"));
+                        resellable_clause->setText(getString("can_not_resell"));
                 }
                 else
                 {
-                        resellable_clause->setText(childGetText("can_resell"));
+                        resellable_clause->setText(getString("can_resell"));
                 }
         }
         
-        LLTextBox* changeable_clause = (LLTextBox*)getChildByName("changeable_clause");
+        LLTextBox* changeable_clause = getChild<LLTextBox>("changeable_clause");
         if (changeable_clause)
         {
                 if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)
                 {
-                        changeable_clause->setText(childGetText("can_change"));
+                        changeable_clause->setText(getString("can_change"));
                 }
                 else
                 {
-                        changeable_clause->setText(childGetText("can_not_change"));
+                        changeable_clause->setText(getString("can_not_change"));
                 }
         }
 
@@ -2493,12 +2623,12 @@ bool LLPanelEstateCovenant::estateUpdate(LLMessageSystem* msg)
 BOOL LLPanelEstateCovenant::postBuild()
 {
         initHelpBtn("covenant_help",            "HelpEstateCovenant");
-        mEstateNameText = (LLTextBox*)getChildByName("estate_name_text");
-        mEstateOwnerText = (LLTextBox*)getChildByName("estate_owner_text");
-        mLastModifiedText = (LLTextBox*)getChildByName("covenant_timestamp_text");
-        mEditor = (LLViewerTextEditor*)getChildByName("covenant_editor");
+        mEstateNameText = getChild<LLTextBox>("estate_name_text");
+        mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");
+        mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");
+        mEditor = getChild<LLViewerTextEditor>("covenant_editor");
         if (mEditor) mEditor->setHandleEditKeysDirectly(TRUE);
-        LLButton* reset_button = (LLButton*)getChildByName("reset_covenant");
+        LLButton* reset_button = getChild<LLButton>("reset_covenant");
         reset_button->setEnabled(gAgent.canManageEstate());
         reset_button->setClickedCallback(LLPanelEstateCovenant::resetCovenantID, NULL);
 
@@ -2821,6 +2951,7 @@ bool LLDispatchSetEstateOwner::operator()(
 // strings[6] = str(covenant_id)
 // strings[7] = str(covenant_timestamp)
 // strings[8] = str(send_to_agent_only)
+// strings[9] = str(abuse_email_addr)
 bool LLDispatchEstateUpdateInfo::operator()(
                 const LLDispatcher* dispatcher,
                 const std::string& key,
@@ -2836,6 +2967,15 @@ bool LLDispatchEstateUpdateInfo::operator()(
         std::string estate_name = strings[0].c_str();
         panel->setEstateName(estate_name);
 
+        if (strings.size() > 9)
+        {
+                std::string abuse_email = strings[9].c_str();
+                panel->setAbuseEmailAddress(abuse_email);
+        }
+        else
+        {
+                panel->setAbuseEmailAddress("@ Old Server @");
+        }
 
         LLViewerRegion* regionp = gAgent.getRegion();