diff options
-rw-r--r-- | ChangeLog.txt | 3 | ||||
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 6a995a3..a24b1fe 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -19,6 +19,9 @@ | |||
19 | * linden/indra/newview/llfloaterstats.cpp: | 19 | * linden/indra/newview/llfloaterstats.cpp: |
20 | Ditto. | 20 | Ditto. |
21 | 21 | ||
22 | * linden/indra/newview/llappviewer.cpp: | ||
23 | Backported fix for VWR-8783, original patch by Gigs Taggart. | ||
24 | |||
22 | 25 | ||
23 | 2009-03-01 McCabe Maxsted <hakushakukun@gmail.com> | 26 | 2009-03-01 McCabe Maxsted <hakushakukun@gmail.com> |
24 | 27 | ||
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() | |||
3686 | // Check that the circuit between the viewer and the agent's current | 3686 | // Check that the circuit between the viewer and the agent's current |
3687 | // region is still alive | 3687 | // region is still alive |
3688 | LLViewerRegion *agent_region = gAgent.getRegion(); | 3688 | LLViewerRegion *agent_region = gAgent.getRegion(); |
3689 | if (agent_region) | 3689 | if (agent_region && LLStartUp::getStartupState() == STATE_STARTED) |
3690 | { | 3690 | { |
3691 | LLUUID this_region_id = agent_region->getRegionID(); | 3691 | LLUUID this_region_id = agent_region->getRegionID(); |
3692 | bool this_region_alive = agent_region->isAlive(); | 3692 | bool this_region_alive = agent_region->isAlive(); |