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/llsecondlifeurls.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 '')
-rw-r--r-- | linden/indra/llcommon/llsecondlifeurls.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h index 9c64b57..e3932d0 100644 --- a/linden/indra/llcommon/llsecondlifeurls.h +++ b/linden/indra/llcommon/llsecondlifeurls.h | |||
@@ -34,14 +34,14 @@ | |||
34 | #define LL_LLSECONDLIFEURLS_H | 34 | #define LL_LLSECONDLIFEURLS_H |
35 | 35 | ||
36 | 36 | ||
37 | extern const std::string AUCTION_URL; | 37 | LL_COMMON_API extern const std::string AUCTION_URL; |
38 | 38 | ||
39 | extern const std::string EVENTS_URL; | 39 | LL_COMMON_API extern const std::string EVENTS_URL; |
40 | 40 | ||
41 | // Currency page | 41 | // Currency page |
42 | extern const std::string BUY_CURRENCY_URL; | 42 | LL_COMMON_API extern const std::string BUY_CURRENCY_URL; |
43 | 43 | ||
44 | // Release Notes Redirect URL for Server and Viewer | 44 | // Release Notes Redirect URL for Server and Viewer |
45 | extern const std::string RELEASE_NOTES_BASE_URL; | 45 | LL_COMMON_API extern const std::string RELEASE_NOTES_BASE_URL; |
46 | 46 | ||
47 | #endif | 47 | #endif |