summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-23 17:18:37 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-23 17:18:37 +0300
commit07b463722e3e87aaea608981a1020f1b482781ba (patch)
treeec0381c5bfd491b5e71977aba29b5c7ccc275db0 /indra/newview/llnavigationbar.cpp
parent1186e6dd74c7e828eacb93959b57f5ee074741a4 (diff)
Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).
Reason: Attempt to purge empty teleport history resulted in inconsistent history state. There were two consequences: 1) Further teleports would not properly update the history. 2) Subscribers of history changes were notified of the invalid change and that led to the crash. My changes: - added a sanity check to LLTeleportHistoryStorage::onTeleportHistoryChange() to prevent the crash - purging empty teleport history now does nothing, hence the history doesn't become inconsistent - removed a redundant (but harmless) call to onTeleportHistoryChanged() from LLNavigationBar::draw() because it's called by LLTeleportHistory::purgeItems() anyway Reviewed by Mike at https://codereview.productengine.com/secondlife/r/304/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index e11df06d86..0341f2c693 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -375,7 +375,6 @@ void LLNavigationBar::draw()
if(mPurgeTPHistoryItems)
{
LLTeleportHistory::getInstance()->purgeItems();
- onTeleportHistoryChanged();
mPurgeTPHistoryItems = false;
}