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.

1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index 2cc94c2..be40bb6 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -75,7 +75,7 @@ protected:
                 ///< This constructor is used for static objects and causes the
                 //   suppresses adjusting the debugging counters when they are
                 //       finally initialized.
-                
+
         virtual ~Impl();
         
         bool shared() const                                                     { return mUseCount > 1; }
@@ -162,6 +162,7 @@ namespace
                 
                 virtual LLSD::Type type() const { return T; }
 
+                using LLSD::Impl::assign;
                 virtual void assign(LLSD::Impl*& var, DataRef value) {
                         if (shared())
                         {
@@ -348,6 +349,10 @@ namespace
 
                 virtual LLSD::Boolean asBoolean() const { return !mData.empty(); }
 
+                using LLSD::Impl::get; // Unhiding get(LLSD::Integer)
+                using LLSD::Impl::erase; // Unhiding erase(LLSD::Integer)
+                using LLSD::Impl::ref; // Unhiding ref(LLSD::Integer)
+
                 virtual bool has(const LLSD::String&) const; 
                 virtual LLSD get(const LLSD::String&) const; 
                         LLSD& insert(const LLSD::String& k, const LLSD& v);
@@ -440,6 +445,11 @@ namespace
                 virtual LLSD::Boolean asBoolean() const { return !mData.empty(); }
 
                 virtual int size() const; 
+
+                using LLSD::Impl::get; // Unhiding get(LLSD::Integer)
+                using LLSD::Impl::erase; // Unhiding erase(LLSD::Integer)
+                using LLSD::Impl::ref; // Unhiding ref(LLSD::Integer)
+
                 virtual LLSD get(LLSD::Integer) const;
                         void set(LLSD::Integer, const LLSD&);
                         LLSD& insert(LLSD::Integer, const LLSD&);