diff options
author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llevent.h | |
parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz |
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llcommon/llevent.h')
-rw-r--r-- | linden/indra/llcommon/llevent.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h index 60887a0..6b223a8 100644 --- a/linden/indra/llcommon/llevent.h +++ b/linden/indra/llcommon/llevent.h | |||
@@ -44,7 +44,7 @@ class LLEventDispatcher; | |||
44 | class LLObservable; | 44 | class LLObservable; |
45 | 45 | ||
46 | // Abstract event. All events derive from LLEvent | 46 | // Abstract event. All events derive from LLEvent |
47 | class LLEvent : public LLThreadSafeRefCount | 47 | class LL_COMMON_API LLEvent : public LLThreadSafeRefCount |
48 | { | 48 | { |
49 | protected: | 49 | protected: |
50 | virtual ~LLEvent(); | 50 | virtual ~LLEvent(); |
@@ -72,7 +72,7 @@ private: | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | // Abstract listener. All listeners derive from LLEventListener | 74 | // Abstract listener. All listeners derive from LLEventListener |
75 | class LLEventListener : public LLThreadSafeRefCount | 75 | class LL_COMMON_API LLEventListener : public LLThreadSafeRefCount |
76 | { | 76 | { |
77 | protected: | 77 | protected: |
78 | virtual ~LLEventListener(); | 78 | virtual ~LLEventListener(); |
@@ -89,7 +89,7 @@ public: | |||
89 | }; | 89 | }; |
90 | 90 | ||
91 | // A listener which tracks references to it and cleans up when it's deallocated | 91 | // A listener which tracks references to it and cleans up when it's deallocated |
92 | class LLSimpleListener : public LLEventListener | 92 | class LL_COMMON_API LLSimpleListener : public LLEventListener |
93 | { | 93 | { |
94 | public: | 94 | public: |
95 | void clearDispatchers(); | 95 | void clearDispatchers(); |
@@ -114,7 +114,7 @@ struct LLListenerEntry | |||
114 | // Base class for a dispatcher - an object which listens | 114 | // Base class for a dispatcher - an object which listens |
115 | // to events being fired and relays them to their | 115 | // to events being fired and relays them to their |
116 | // appropriate destinations. | 116 | // appropriate destinations. |
117 | class LLEventDispatcher : public LLThreadSafeRefCount | 117 | class LL_COMMON_API LLEventDispatcher : public LLThreadSafeRefCount |
118 | { | 118 | { |
119 | protected: | 119 | protected: |
120 | virtual ~LLEventDispatcher(); | 120 | virtual ~LLEventDispatcher(); |
@@ -157,7 +157,7 @@ private: | |||
157 | // In order for this class to work properly, it needs | 157 | // In order for this class to work properly, it needs |
158 | // an instance of an LLEventDispatcher to route events to their | 158 | // an instance of an LLEventDispatcher to route events to their |
159 | // listeners. | 159 | // listeners. |
160 | class LLObservable | 160 | class LL_COMMON_API LLObservable |
161 | { | 161 | { |
162 | public: | 162 | public: |
163 | // Initialize with the default Dispatcher | 163 | // Initialize with the default Dispatcher |