diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-06 00:37:09 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-06 00:37:09 +0000 |
| commit | 14360b815ed486c90c57b8025f8c93376ca6b6c6 (patch) | |
| tree | 30707bf0bf390ebf6357325aa31e34ad8553f2ac /indra/llcommon | |
| parent | b06b9cd30464188f68a1125db9ecc588fdf5ca71 (diff) | |
merge -r 58641:58711 maintenance -> release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llmemory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index d543d023ff..f7f4818740 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -239,7 +239,7 @@ public: // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed. template<typename Subclass> - LLHandle(const LLPointer<Subclass>& ptr) : + LLHandle(const LLHandle<Subclass>& ptr) : mPointer(ptr.get()) { ref(); |