diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-16 21:02:48 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-16 21:02:48 -0400 |
commit | c370313676451f6e5cfd72bec314ad79bc653833 (patch) | |
tree | 1bd99330b482d828f8edc71691d177078123fd1e /indra/llcommon/llpointer.h | |
parent | 988767d5ec4631ad9f0099180a92c4f186553940 (diff) | |
parent | f2e2ea99a351ca8663af460974137545d020b97f (diff) |
Automated merge with file:///Users/nat/linden/viewer-sourceid
Diffstat (limited to 'indra/llcommon/llpointer.h')
-rw-r--r-- | indra/llcommon/llpointer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h index affa040602..88c09c8dca 100644 --- a/indra/llcommon/llpointer.h +++ b/indra/llcommon/llpointer.h @@ -140,6 +140,10 @@ public: } protected: +#ifdef LL_LIBRARY_INCLUDE + void ref(); + void unref(); +#else void ref() { if (mPointer) @@ -162,7 +166,7 @@ protected: } } } - +#endif protected: Type* mPointer; }; |