summaryrefslogtreecommitdiff
path: root/indra/llcommon/llpointer.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-08-03 11:57:51 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-08-03 11:57:51 -0400
commitfdb2ae8335f136283910f9538e74724b69886e15 (patch)
tree79ed0377590b5d291a301d3ae138145d4cb4608e /indra/llcommon/llpointer.h
parent1d5490e752deeff316658f4850aac5fc96a91866 (diff)
parentb8bac66a0f8c392a221ad2c64611e2a55de82339 (diff)
Merge of viewer-development (3.4.1).
Diffstat (limited to 'indra/llcommon/llpointer.h')
-rw-r--r--indra/llcommon/llpointer.h6
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;
};