aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llerror.h
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 16:55:50 +0100
committerAleric Inglewood2010-11-07 18:27:48 +0100
commit5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch)
tree43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llerror.h
parentIMP-688: ERROR: getString: Invalid string control nick01 (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/llcommon/llerror.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h
index 37e922d..5a4c644 100644
--- a/linden/indra/llcommon/llerror.h
+++ b/linden/indra/llcommon/llerror.h
@@ -131,7 +131,7 @@ namespace LLError
131 131
132 class CallSite; 132 class CallSite;
133 133
134 class Log 134 class LL_COMMON_API Log
135 { 135 {
136 public: 136 public:
137 static bool shouldLog(CallSite&); 137 static bool shouldLog(CallSite&);
@@ -140,7 +140,7 @@ namespace LLError
140 static void flush(std::ostringstream*, const CallSite&); 140 static void flush(std::ostringstream*, const CallSite&);
141 }; 141 };
142 142
143 class CallSite 143 class LL_COMMON_API CallSite
144 { 144 {
145 // Represents a specific place in the code where a message is logged 145 // Represents a specific place in the code where a message is logged
146 // This is public because it is used by the macros below. It is not 146 // This is public because it is used by the macros below. It is not
@@ -189,7 +189,7 @@ namespace LLError
189 //LLCallStacks is designed not to be thread-safe. 189 //LLCallStacks is designed not to be thread-safe.
190 //so try not to use it in multiple parallel threads at same time. 190 //so try not to use it in multiple parallel threads at same time.
191 //Used in a single thread at a time is fine. 191 //Used in a single thread at a time is fine.
192 class LLCallStacks 192 class LL_COMMON_API LLCallStacks
193 { 193 {
194 private: 194 private:
195 static char** sBuffer ; 195 static char** sBuffer ;