From 27d3bf9ad371719aeaeb468ae37fbfabf9e58ad4 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 7 Mar 2009 18:43:32 -0700 Subject: Backported fix for VWR-8783, original patch by Gigs Taggart --- ChangeLog.txt | 3 +++ linden/indra/newview/llappviewer.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6a995a3..a24b1fe 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -19,6 +19,9 @@ * linden/indra/newview/llfloaterstats.cpp: Ditto. + * linden/indra/newview/llappviewer.cpp: + Backported fix for VWR-8783, original patch by Gigs Taggart. + 2009-03-01 McCabe Maxsted diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 15ce1a3..04117bf 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -3686,7 +3686,7 @@ void LLAppViewer::idleNetwork() // Check that the circuit between the viewer and the agent's current // region is still alive LLViewerRegion *agent_region = gAgent.getRegion(); - if (agent_region) + if (agent_region && LLStartUp::getStartupState() == STATE_STARTED) { LLUUID this_region_id = agent_region->getRegionID(); bool this_region_alive = agent_region->isAlive(); -- cgit v1.1