aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergroupinfo.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloatergroupinfo.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloatergroupinfo.h b/linden/indra/newview/llfloatergroupinfo.h
index 28ff628..2ce7102 100644
--- a/linden/indra/newview/llfloatergroupinfo.h
+++ b/linden/indra/newview/llfloatergroupinfo.h
@@ -57,12 +57,12 @@ public:
57 static void closeGroup(const LLUUID& group_id); 57 static void closeGroup(const LLUUID& group_id);
58 static void refreshGroup(const LLUUID& group_id); 58 static void refreshGroup(const LLUUID& group_id);
59 59
60 static void showNotice(const char* subject, 60 static void showNotice(const std::string& subject,
61 const char* message, 61 const std::string& message,
62 const LLUUID& group_id, 62 const LLUUID& group_id,
63 const bool& has_inventory, 63 const bool& has_inventory,
64 const char* inventory_name, 64 const std::string& inventory_name,
65 LLOfferInfo* inventory_offer); 65 LLOfferInfo* inventory_offer);
66 66
67 LLUUID getGroupID() { return mGroupID;} 67 LLUUID getGroupID() { return mGroupID;}
68 68
@@ -75,7 +75,7 @@ protected:
75 LLFloaterGroupInfo(const std::string& name, const LLRect &rect, const std::string& title, const LLUUID& group_id = LLUUID::null, const std::string& tab_name = std::string()); 75 LLFloaterGroupInfo(const std::string& name, const LLRect &rect, const std::string& title, const LLUUID& group_id = LLUUID::null, const std::string& tab_name = std::string());
76 76
77private: 77private:
78 static void callbackLoadGroupName(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* data); 78 static void callbackLoadGroupName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data);
79 static std::map<LLUUID, LLFloaterGroupInfo*> sInstances; 79 static std::map<LLUUID, LLFloaterGroupInfo*> sInstances;
80 80
81 LLUUID mGroupID; 81 LLUUID mGroupID;