summaryrefslogtreecommitdiff
path: root/indra/newview/llsechandler_basic.h
diff options
context:
space:
mode:
authorpalange <palange@lindenlab.com>2010-05-28 09:35:46 -0700
committerpalange <palange@lindenlab.com>2010-05-28 09:35:46 -0700
commit88d7073593ccf590d7b2b8e69c58c89029f8466e (patch)
tree0070c9addec90cfb9b046f5611ca6ac98f74ed0b /indra/newview/llsechandler_basic.h
parenta6a9e893930584db90a57263211b7eac787085a0 (diff)
parentc901048d98a68a992cf1945e5802ec34087f67bb (diff)
Automated merge with ssh://hg.lindenlab.com/palange/viewer-2-0
Diffstat (limited to 'indra/newview/llsechandler_basic.h')
-rw-r--r--indra/newview/llsechandler_basic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsechandler_basic.h b/indra/newview/llsechandler_basic.h
index 4bbb73f062..407e74ad00 100644
--- a/indra/newview/llsechandler_basic.h
+++ b/indra/newview/llsechandler_basic.h
@@ -116,6 +116,8 @@ public:
virtual bool equals(const LLPointer<iterator_impl>& _iter) const
{
const BasicIteratorImpl *rhs_iter = dynamic_cast<const BasicIteratorImpl *>(_iter.get());
+ llassert(rhs_iter);
+ if (!rhs_iter) return 0;
return (mIter == rhs_iter->mIter);
}
virtual LLPointer<LLCertificate> get()