summaryrefslogtreecommitdiff
path: root/indra/llcommon/llpointer.h
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-07-31 15:42:02 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-07-31 15:42:02 -0700
commit83f5d0c61667ae7682893adbb8939f77b28c2201 (patch)
tree081ac47802bf782a8dcd55d7c2fd100ee3f03b89 /indra/llcommon/llpointer.h
parent7cd5f7d479b889c3dcdb4bcd0ee6b65b5b5a025f (diff)
parentb8bac66a0f8c392a221ad2c64611e2a55de82339 (diff)
Merge in viewer-development
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;
};