Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Issue 662] Update llfloaterregioninfo.* in preparation for adding new functionality.

Browse Source
This commit is contained in:
Lirusaito
2013-02-28 15:04:05 -05:00
parent 6525ccc384
commit df8595b72e
3 changed files with 313 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

627
indra/newview/llfloaterregioninfo.cpp
View File

File diff suppressed because it is too large Load Diff

92
indra/newview/llfloaterregioninfo.h
View File

@@ -62,11 +62,12 @@ class LLPanelRegionTerrainInfo;
class LLPanelEstateInfo; class LLPanelEstateInfo;
class LLPanelEstateCovenant; class LLPanelEstateCovenant;
class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloaterRegionInfo> class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloaterRegionInfo>
{ {
friend class LLUISingleton<LLFloaterRegionInfo, VisibilityPolicy<LLFloater> >; friend class LLUISingleton<LLFloaterRegionInfo, VisibilityPolicy<LLFloater> >;
public: public:
~LLFloaterRegionInfo();
/*virtual*/ void onOpen(); /*virtual*/ void onOpen();
/*virtual*/ BOOL postBuild(); /*virtual*/ BOOL postBuild();
@@ -90,10 +91,12 @@ public:
// from LLPanel // from LLPanel
virtual void refresh(); virtual void refresh();
static void requestRegionInfo(); void requestRegionInfo();
protected: protected:
LLFloaterRegionInfo(const LLSD& seed); LLFloaterRegionInfo(const LLSD& seed);
~LLFloaterRegionInfo();
void refreshFromRegion(LLViewerRegion* region); void refreshFromRegion(LLViewerRegion* region);
// member data // member data
@@ -109,10 +112,11 @@ protected:
class LLPanelRegionInfo : public LLPanel class LLPanelRegionInfo : public LLPanel
{ {
public: public:
LLPanelRegionInfo() : LLPanel(std::string("Region Info Panel")) {} LLPanelRegionInfo();
static void onBtnSet(void* user_data);
static void onChangeChildCtrl(LLUICtrl* ctrl, void* user_data); void onBtnSet();
static void onChangeAnything(LLUICtrl* ctrl, void* user_data); void onChangeChildCtrl(LLUICtrl* ctrl);
void onChangeAnything();
static void onChangeText(LLLineEditor* caller, void* user_data); static void onChangeText(LLLineEditor* caller, void* user_data);
virtual bool refreshFromRegion(LLViewerRegion* region); virtual bool refreshFromRegion(LLViewerRegion* region);
@@ -124,12 +128,14 @@ public:
void enableButton(const std::string& btn_name, BOOL enable = TRUE); void enableButton(const std::string& btn_name, BOOL enable = TRUE);
void disableButton(const std::string& btn_name); void disableButton(const std::string& btn_name);
void onClickManageTelehub();
protected: protected:
void initCtrl(const std::string& name); void initCtrl(const std::string& name);
void initHelpBtn(const std::string& name, const std::string& xml_alert); void initHelpBtn(const std::string& name, const std::string& xml_alert);
// Callback for all help buttons, data is name of XML alert to show. // Callback for all help buttons, xml_alert is the name of XML alert to show.
static void onClickHelp(void* data); void onClickHelp(const std::string& xml_alert);
// Returns TRUE if update sent and apply button should be // Returns TRUE if update sent and apply button should be
// disabled. // disabled.
@@ -153,6 +159,7 @@ protected:
class LLPanelRegionGeneralInfo : public LLPanelRegionInfo class LLPanelRegionGeneralInfo : public LLPanelRegionInfo
{ {
public: public:
LLPanelRegionGeneralInfo() LLPanelRegionGeneralInfo()
: LLPanelRegionInfo() {} : LLPanelRegionInfo() {}
@@ -162,16 +169,16 @@ public:
// LLPanel // LLPanel
virtual BOOL postBuild(); virtual BOOL postBuild();
protected: protected:
virtual BOOL sendUpdate(); virtual BOOL sendUpdate();
void onClickKick();
static void onClickKick(void* userdata);
void onKickCommit(const uuid_vec_t& ids); void onKickCommit(const uuid_vec_t& ids);
static void onClickKickAll(void* userdata); static void onClickKickAll(void* userdata);
bool onKickAllCommit(const LLSD& notification, const LLSD& response); bool onKickAllCommit(const LLSD& notification, const LLSD& response);
static void onClickMessage(void* userdata); static void onClickMessage(void* userdata);
bool onMessageCommit(const LLSD& notification, const LLSD& response); bool onMessageCommit(const LLSD& notification, const LLSD& response);
static void onClickManageTelehub(void* data);
}; };
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -190,14 +197,14 @@ public:
protected: protected:
virtual BOOL sendUpdate(); virtual BOOL sendUpdate();
static void onClickChooseAvatar(void*); void onClickChooseAvatar();
void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName>& names); void callbackAvatarID(const uuid_vec_t& ids, const std::vector<LLAvatarName>& names);
static void onClickReturn(void *); static void onClickReturn(void *);
bool callbackReturn(const LLSD& notification, const LLSD& response); bool callbackReturn(const LLSD& notification, const LLSD& response);
static void onClickTopColliders(void*); static void onClickTopColliders(void*);
static void onClickTopScripts(void*); static void onClickTopScripts(void*);
static void onClickRestart(void* data); static void onClickRestart(void* data);
bool callbackRestart(const LLSD& notification, const LLSD& response, S32 seconds); bool callbackRestart(const LLSD& notification, const LLSD& response);
static void onClickCancelRestart(void* data); static void onClickCancelRestart(void* data);
private: private:
@@ -212,15 +219,12 @@ public:
LLPanelRegionTextureInfo(); LLPanelRegionTextureInfo();
~LLPanelRegionTextureInfo() {} ~LLPanelRegionTextureInfo() {}
virtual bool refreshFromRegion(LLViewerRegion* region); virtual BOOL postBuild(); // LLPanel
// LLPanel && LLView virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator
virtual BOOL postBuild();
protected: protected:
virtual BOOL sendUpdate(); virtual BOOL sendUpdate();
static void onClickDump(void* data);
BOOL validateTextureSizes(); BOOL validateTextureSizes();
}; };
@@ -228,21 +232,20 @@ protected:
class LLPanelRegionTerrainInfo : public LLPanelRegionInfo class LLPanelRegionTerrainInfo : public LLPanelRegionInfo
{ {
public: LOG_CLASS(LLPanelRegionTerrainInfo);
LLPanelRegionTerrainInfo()
: LLPanelRegionInfo() {}
~LLPanelRegionTerrainInfo() {}
// LLPanel
virtual BOOL postBuild();
virtual bool refreshFromRegion(LLViewerRegion* region); public:
LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {}
~LLPanelRegionTerrainInfo() {}
virtual BOOL postBuild(); // LLPanel
virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator
protected: protected:
virtual BOOL sendUpdate(); virtual BOOL sendUpdate();
static void onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data); static void onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data);
static void onChangeFixedSun(LLUICtrl* ctrl, void* user_data);
static void onChangeSunHour(LLUICtrl* ctrl, void*);
static void onClickDownloadRaw(void*); static void onClickDownloadRaw(void*);
void onClickDownloadRaw_continued(AIFilePicker* filepicker); void onClickDownloadRaw_continued(AIFilePicker* filepicker);
@@ -259,27 +262,27 @@ class LLPanelEstateInfo : public LLPanelRegionInfo
public: public:
static void initDispatch(LLDispatcher& dispatch); static void initDispatch(LLDispatcher& dispatch);
static void onChangeFixedSun(LLUICtrl* ctrl, void* user_data); void onChangeFixedSun();
static void onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data); void onChangeUseGlobalTime();
static void onClickEditSky(void* userdata); void onClickEditSky();
static void onClickEditSkyHelp(void* userdata); void onClickEditSkyHelp();
static void onClickEditDayCycle(void* userdata); void onClickEditDayCycle();
static void onClickEditDayCycleHelp(void* userdata); void onClickEditDayCycleHelp();
static void onClickAddAllowedAgent(void* user_data); void onClickAddAllowedAgent();
static void onClickRemoveAllowedAgent(void* user_data); void onClickRemoveAllowedAgent();
static void onClickAddAllowedGroup(void* user_data); void onClickAddAllowedGroup();
static void onClickRemoveAllowedGroup(void* user_data); void onClickRemoveAllowedGroup();
static void onClickAddBannedAgent(void* user_data); void onClickAddBannedAgent();
static void onClickRemoveBannedAgent(void* user_data); void onClickRemoveBannedAgent();
static void onClickAddEstateManager(void* user_data); void onClickAddEstateManager();
static void onClickRemoveEstateManager(void* user_data); void onClickRemoveEstateManager();
static void onClickKickUser(void* userdata); void onClickKickUser();
// Group picker callback is different, can't use core methods below // Group picker callback is different, can't use core methods below
bool addAllowedGroup(const LLSD& notification, const LLSD& response); bool addAllowedGroup(const LLSD& notification, const LLSD& response);
static void addAllowedGroup2(LLUUID id, void* data); static void addAllowedGroup2(LLUUID id, void*);
// Core methods for all above add/remove button clicks // Core methods for all above add/remove button clicks
static void accessAddCore(U32 operation_flag, const std::string& dialog_name); static void accessAddCore(U32 operation_flag, const std::string& dialog_name);
@@ -334,9 +337,6 @@ public:
const std::string getOwnerName() const; const std::string getOwnerName() const;
void setOwnerName(const std::string& name); void setOwnerName(const std::string& name);
const std::string getAbuseEmailAddress() const;
void setAbuseEmailAddress(const std::string& address);
// If visible from mainland, allowed agent and allowed groups // If visible from mainland, allowed agent and allowed groups
// are ignored, so must disable UI. // are ignored, so must disable UI.
void setAccessAllowedEnabled(bool enable_agent, bool enable_group, bool enable_ban); void setAccessAllowedEnabled(bool enable_agent, bool enable_group, bool enable_ban);

9
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -69,15 +69,6 @@ regions in the estate.
left="12" name="allow_direct_teleport" width="80" /> left="12" name="allow_direct_teleport" width="80" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
name="allow_direct_teleport_help" right="250" width="18" /> name="allow_direct_teleport_help" right="250" width="18" />
<text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="abuse_email_text" width="180">
Abuse email address:
</text>
<line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
name="abuse_email_address" width="205" />
<string name="email_unsupported">Feature unsupported</string>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
name="abuse_email_address_help" right="250" width="18" />
<button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply" <button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
name="apply_btn" right="250" width="90" /> name="apply_btn" right="250" width="90" />
<button bottom="-468" enabled="true" follows="left|top" height="20" <button bottom="-468" enabled="true" follows="left|top" height="20"