aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorSean Dague2008-05-22 17:55:28 +0000
committerSean Dague2008-05-22 17:55:28 +0000
commit36bfa66719d3ef6c1d1be9901dc362bea84f5e3f (patch)
treea3640b70ce2728e2653fa8405f44550facd2e6f1 /OpenSim/Region/Communications
parentcatch case where avatar might have been child agent (diff)
downloadopensim-SC_OLD-36bfa66719d3ef6c1d1be9901dc362bea84f5e3f.zip
opensim-SC_OLD-36bfa66719d3ef6c1d1be9901dc362bea84f5e3f.tar.gz
opensim-SC_OLD-36bfa66719d3ef6c1d1be9901dc362bea84f5e3f.tar.bz2
opensim-SC_OLD-36bfa66719d3ef6c1d1be9901dc362bea84f5e3f.tar.xz
we should be return null in these 2 places, though this won't
help with the timeouts.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index a1ef67f..8807eab 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Communications.OGS1
97 "Error sent by user server when trying to get user appearance: (" + 97 "Error sent by user server when trying to get user appearance: (" +
98 data["error_type"] + 98 data["error_type"] +
99 "): " + data["error_desc"]); 99 "): " + data["error_desc"]);
100 return new AvatarAppearance(); 100 return null;
101 } 101 }
102 else 102 else
103 { 103 {
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.OGS1
107 else 107 else
108 { 108 {
109 m_log.Error("[GRID]: The avatar appearance is null, something bad happenend"); 109 m_log.Error("[GRID]: The avatar appearance is null, something bad happenend");
110 return new AvatarAppearance(); 110 return null;
111 } 111 }
112 } 112 }
113 113