aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorAdam Frisby2009-05-10 21:35:07 +0000
committerAdam Frisby2009-05-10 21:35:07 +0000
commit54ab7d7ceb38858346958ad22e07076365966970 (patch)
treea57556543f74a57b16a5615dc0c320d1d7e63f94 /OpenSim
parent* Attempting to fix NullRef exception in inventory. (diff)
downloadopensim-SC_OLD-54ab7d7ceb38858346958ad22e07076365966970.zip
opensim-SC_OLD-54ab7d7ceb38858346958ad22e07076365966970.tar.gz
opensim-SC_OLD-54ab7d7ceb38858346958ad22e07076365966970.tar.bz2
opensim-SC_OLD-54ab7d7ceb38858346958ad22e07076365966970.tar.xz
* Rather than crash the region simulator, declare the teleport a failure if the "success" mapping doesn't exist. (also; I hate LLSD.)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Clients/RegionClient.cs19
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Clients/RegionClient.cs b/OpenSim/Framework/Communications/Clients/RegionClient.cs
index 6fdacb1..bd71357 100644
--- a/OpenSim/Framework/Communications/Clients/RegionClient.cs
+++ b/OpenSim/Framework/Communications/Clients/RegionClient.cs
@@ -124,12 +124,19 @@ namespace OpenSim.Framework.Communications.Clients
124 124
125 if (!String.IsNullOrEmpty(response)) 125 if (!String.IsNullOrEmpty(response))
126 { 126 {
127 // we assume we got an OSDMap back 127 try
128 OSDMap r = GetOSDMap(response); 128 {
129 bool success = r["success"].AsBoolean(); 129 // we assume we got an OSDMap back
130 reason = r["reason"].AsString(); 130 OSDMap r = GetOSDMap(response);
131 131 bool success = r["success"].AsBoolean();
132 return success; 132 reason = r["reason"].AsString();
133 return success;
134 }
135 catch (NullReferenceException e)
136 {
137 m_log.InfoFormat("[REST COMMS]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
138 return false;
139 }
133 } 140 }
134 } 141 }
135 } 142 }