aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-03-07 18:43:32 -0700
committerMcCabe Maxsted2009-03-07 18:43:32 -0700
commit27d3bf9ad371719aeaeb468ae37fbfabf9e58ad4 (patch)
treed7b0df84e66540b9cea1a1becc19bbca2acd62dc /linden
parentApplied remember stats position and size patch from Latif Khalifa (diff)
downloadmeta-impy-27d3bf9ad371719aeaeb468ae37fbfabf9e58ad4.zip
meta-impy-27d3bf9ad371719aeaeb468ae37fbfabf9e58ad4.tar.gz
meta-impy-27d3bf9ad371719aeaeb468ae37fbfabf9e58ad4.tar.bz2
meta-impy-27d3bf9ad371719aeaeb468ae37fbfabf9e58ad4.tar.xz
Backported fix for VWR-8783, original patch by Gigs Taggart
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
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();