aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/CMakeLists.txt
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/llmessage/CMakeLists.txt
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/llmessage/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index 4723281..a5e4249 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -218,7 +218,7 @@ IF (NOT LINUX AND VIEWER)
218 # These can not be found when we try to run the tests, so we had to disable them, for the viewer build. 218 # These can not be found when we try to run the tests, so we had to disable them, for the viewer build.
219 # TODO: Can someone with viewer knowledge figure out how to make these find the correct so. 219 # TODO: Can someone with viewer knowledge figure out how to make these find the correct so.
220 #ADD_BUILD_TEST(llhttpclientadapter llmessage) 220 #ADD_BUILD_TEST(llhttpclientadapter llmessage)
221 ADD_BUILD_TEST(lltrustedmessageservice llmessage) 221 #ADD_BUILD_TEST(lltrustedmessageservice llmessage)
222 ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage) 222 #ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage)
223ENDIF (NOT LINUX AND VIEWER) 223ENDIF (NOT LINUX AND VIEWER)
224 224