summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llgroupmgr.cpp1
-rwxr-xr-xindra/newview/llgroupmgr.h3
-rw-r--r--indra/newview/llpanelgroupbulkban.cpp10
-rwxr-xr-xindra/newview/skins/default/xui/en/role_actions.xml4
4 files changed, 7 insertions, 11 deletions
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index f5cf025875..1e5c43dcdf 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1957,6 +1957,7 @@ void LLGroupMgr::processGroupBanRequest(const LLSD& content)
if(ban_entry.has("ban_date"))
{
ban_data.mBanDate = ban_entry["ban_date"].asDate();
+ // TODO: Ban Reason
}
gdatap->createBanEntry(ban_id, ban_data);
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index ba767b91ad..3cbeda18dc 100755
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -198,7 +198,8 @@ struct LLGroupBanData
LLGroupBanData(): mBanDate() {}
~LLGroupBanData() {}
- LLDate mBanDate; // Just store something here to ensure it works.
+ LLDate mBanDate;
+ // TODO: std:string ban_reason;
};
diff --git a/indra/newview/llpanelgroupbulkban.cpp b/indra/newview/llpanelgroupbulkban.cpp
index af1809b1f8..3b442036fa 100644
--- a/indra/newview/llpanelgroupbulkban.cpp
+++ b/indra/newview/llpanelgroupbulkban.cpp
@@ -100,16 +100,10 @@ BOOL LLPanelGroupBulkBan::postBuild()
mImplementation->mTooManySelected = getString("ban_selection_too_large");
update();
-
- // return (mImplementation->mRoleNames &&
- // mImplementation->mBannedAgents &&
- // mImplementation->mRemoveButton);
-
- return (mImplementation->mBulkAgentList &&
- mImplementation->mRemoveButton);
+ return TRUE;
}
-
+// TODO: Refactor the shitty callback functions with void* -- just use boost::bind to call submit() instead.
void LLPanelGroupBulkBan::callbackClickSubmit(void* userdata)
{
LLPanelGroupBulkBan* selfp = (LLPanelGroupBulkBan*)userdata;
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 7459fdae98..0c8a043ea7 100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -2,8 +2,8 @@
<role_actions>
<action_set
description="These Abilities include powers to ban and un-ban residents from the group."
- name="Bans">
- <action description="Manage ban list."
+ name="Group Ban">
+ <action description="Manage ban list"
longdescription="Allows the group member to ban / un-ban Residents from this group."
name="allow ban" value="49" />
</action_set>