diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llgroupmgr.h | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llgroupmgr.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/llgroupmgr.h b/linden/indra/newview/llgroupmgr.h index 89be4bf..709bfd8 100644 --- a/linden/indra/newview/llgroupmgr.h +++ b/linden/indra/newview/llgroupmgr.h | |||
@@ -295,7 +295,7 @@ struct LLRoleActionSet | |||
295 | std::vector<LLRoleAction*> mActions; | 295 | std::vector<LLRoleAction*> mActions; |
296 | }; | 296 | }; |
297 | 297 | ||
298 | class LLGroupMgr | 298 | class LLGroupMgr : public LLSingleton<LLGroupMgr> |
299 | { | 299 | { |
300 | LOG_CLASS(LLGroupMgr); | 300 | LOG_CLASS(LLGroupMgr); |
301 | 301 | ||
@@ -350,19 +350,18 @@ public: | |||
350 | static void debugClearAllGroups(void*); | 350 | static void debugClearAllGroups(void*); |
351 | void clearGroups(); | 351 | void clearGroups(); |
352 | void clearGroupData(const LLUUID& group_id); | 352 | void clearGroupData(const LLUUID& group_id); |
353 | protected: | 353 | |
354 | private: | ||
354 | void notifyObservers(LLGroupChange gc); | 355 | void notifyObservers(LLGroupChange gc); |
355 | void addGroup(LLGroupMgrGroupData* group_datap); | 356 | void addGroup(LLGroupMgrGroupData* group_datap); |
356 | LLGroupMgrGroupData* createGroupData(const LLUUID &id); | 357 | LLGroupMgrGroupData* createGroupData(const LLUUID &id); |
357 | 358 | ||
358 | protected: | ||
359 | typedef std::multimap<LLUUID,LLGroupMgrObserver*> observer_multimap_t; | 359 | typedef std::multimap<LLUUID,LLGroupMgrObserver*> observer_multimap_t; |
360 | observer_multimap_t mObservers; | 360 | observer_multimap_t mObservers; |
361 | typedef std::map<LLUUID, LLGroupMgrGroupData*> group_map_t; | 361 | typedef std::map<LLUUID, LLGroupMgrGroupData*> group_map_t; |
362 | group_map_t mGroups; | 362 | group_map_t mGroups; |
363 | }; | 363 | }; |
364 | 364 | ||
365 | extern LLGroupMgr* gGroupMgr; | ||
366 | 365 | ||
367 | #endif | 366 | #endif |
368 | 367 | ||