summaryrefslogtreecommitdiff
path: root/indra/newview/llteleporthistorystorage.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-26 10:57:51 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-26 10:57:51 +0100
commit438f0e372ee8a1d41d535314e4061f20f6c66c88 (patch)
treef329e9c86829b06ded1742db7edf271aacb7d3c1 /indra/newview/llteleporthistorystorage.cpp
parent1a987e8d32a733cace7ffdb239729380cd53f87c (diff)
parenta0467365140c504eb0f5ad053ac22a2698a2abd7 (diff)
merge from viewer-trunk
Diffstat (limited to 'indra/newview/llteleporthistorystorage.cpp')
-rw-r--r--indra/newview/llteleporthistorystorage.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp
index c635f91423..430d62e15e 100644
--- a/indra/newview/llteleporthistorystorage.cpp
+++ b/indra/newview/llteleporthistorystorage.cpp
@@ -89,6 +89,13 @@ void LLTeleportHistoryStorage::onTeleportHistoryChange()
if (!th)
return;
+ // Hacky sanity check. (EXT-6798)
+ if (th->getItems().size() == 0)
+ {
+ llassert(!"Inconsistent teleport history state");
+ return;
+ }
+
const LLTeleportHistoryItem &item = th->getItems()[th->getCurrentItemIndex()];
addItem(item.mTitle, item.mGlobalPos);