diff options
| author | Stinson Linden <stinson@lindenlab.com> | 2014-06-02 22:32:16 +0100 |
|---|---|---|
| committer | Stinson Linden <stinson@lindenlab.com> | 2014-06-02 22:32:16 +0100 |
| commit | 8392fde6f6a4dfdb2a78382f3587ecd5a6d937ff (patch) | |
| tree | 5c0b89998c072175cd1d1cb3c429a127af8f04d6 /indra/llcommon/llinitparam.h | |
| parent | 4885c122eaf1b4e304ce598f308d806322efacfc (diff) | |
| parent | 51e0cc8140a2cbe92363cb902144ccc9bf34b7c7 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
Diffstat (limited to 'indra/llcommon/llinitparam.h')
| -rwxr-xr-x | indra/llcommon/llinitparam.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h index 2532566319..7aa87fcd0e 100755 --- a/indra/llcommon/llinitparam.h +++ b/indra/llcommon/llinitparam.h @@ -31,6 +31,7 @@ #include <vector> #include <list> #include <boost/function.hpp> +#include <boost/shared_ptr.hpp> #include <boost/type_traits/is_convertible.hpp> #include <boost/type_traits/is_enum.hpp> #include <boost/unordered_map.hpp> @@ -629,7 +630,7 @@ namespace LLInitParam UserData* mUserData; }; - typedef ParamDescriptor* ParamDescriptorPtr; + typedef boost::shared_ptr<ParamDescriptor> ParamDescriptorPtr; // each derived Block class keeps a static data structure maintaining offsets to various params class LL_COMMON_API BlockDescriptor |