aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-04-23 19:05:32 +0100
committerJustin Clark-Casey (justincc)2010-04-23 19:05:32 +0100
commit5ee77886acde5292a7a527866539e7e05d63e344 (patch)
tree157df3af3bd0175bc73493688c9742312c4d7176
parentChange SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-5ee77886acde5292a7a527866539e7e05d63e344.zip
opensim-SC_OLD-5ee77886acde5292a7a527866539e7e05d63e344.tar.gz
opensim-SC_OLD-5ee77886acde5292a7a527866539e7e05d63e344.tar.bz2
opensim-SC_OLD-5ee77886acde5292a7a527866539e7e05d63e344.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Migration.cs2
-rw-r--r--OpenSim/Framework/WebUtil.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs9
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs13
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
-rw-r--r--bin/Robust.HG.ini.example (renamed from bin/OpenSim.Server.HG.ini.example)0
-rw-r--r--bin/Robust.exe.config (renamed from bin/OpenSim.Server.exe.config)0
-rw-r--r--bin/Robust.ini.example (renamed from bin/OpenSim.Server.ini.example)0
-rw-r--r--prebuild.xml2
9 files changed, 32 insertions, 11 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 4622e23..68e25ef 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -146,6 +146,8 @@ namespace OpenSim.Data
146 { 146 {
147 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText); 147 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", cmd.CommandText);
148 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message); 148 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.", e.Message);
149 cmd.CommandText = "ROLLBACK;";
150 cmd.ExecuteNonQuery();
149 } 151 }
150 152
151 if (version == 0) 153 if (version == 0)
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 2843e20..94862a6 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -146,18 +146,23 @@ namespace OpenSim.Framework
146 { 146 {
147 using (Stream responseStream = response.GetResponseStream()) 147 using (Stream responseStream = response.GetResponseStream())
148 { 148 {
149 string responseStr = null;
150
149 try 151 try
150 { 152 {
151 string responseStr = responseStream.GetStreamString(); 153 responseStr = responseStream.GetStreamString();
152 OSD responseOSD = OSDParser.Deserialize(responseStr); 154 OSD responseOSD = OSDParser.Deserialize(responseStr);
153 if (responseOSD.Type == OSDType.Map) 155 if (responseOSD.Type == OSDType.Map)
154 return (OSDMap)responseOSD; 156 return (OSDMap)responseOSD;
155 else 157 else
156 errorMessage = "Response format was invalid."; 158 errorMessage = "Response format was invalid.";
157 } 159 }
158 catch 160 catch (Exception ex)
159 { 161 {
160 errorMessage = "Failed to parse the response."; 162 if (!String.IsNullOrEmpty(responseStr))
163 errorMessage = "Failed to parse the response:\n" + responseStr;
164 else
165 errorMessage = "Failed to retrieve the response: " + ex.Message;
161 } 166 }
162 } 167 }
163 } 168 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 2296379..4d7ead6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -302,6 +302,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
302 float dz; 302 float dz;
303 303
304 Quaternion q = SensePoint.RotationOffset; 304 Quaternion q = SensePoint.RotationOffset;
305 if (SensePoint.ParentGroup.RootPart.IsAttachment)
306 {
307 // In attachments, the sensor cone always orients with the
308 // avatar rotation. This may include a nonzero elevation if
309 // in mouselook.
310
311 ScenePresence avatar = m_CmdManager.m_ScriptEngine.World.GetScenePresence(SensePoint.ParentGroup.RootPart.AttachedAvatar);
312 q = avatar.Rotation;
313 }
305 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W); 314 LSL_Types.Quaternion r = new LSL_Types.Quaternion(q.X, q.Y, q.Z, q.W);
306 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r); 315 LSL_Types.Vector3 forward_dir = (new LSL_Types.Vector3(1, 0, 0) * r);
307 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir); 316 double mag_fwd = LSL_Types.Vector3.Mag(forward_dir);
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 79e49a1..3fdee9c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -303,9 +303,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
303 HttpWebResponse response = MultipartForm.Post(request, postParameters); 303 HttpWebResponse response = MultipartForm.Post(request, postParameters);
304 using (Stream responseStream = response.GetResponseStream()) 304 using (Stream responseStream = response.GetResponseStream())
305 { 305 {
306 string responseStr = null;
307
306 try 308 try
307 { 309 {
308 string responseStr = responseStream.GetStreamString(); 310 responseStr = responseStream.GetStreamString();
309 OSD responseOSD = OSDParser.Deserialize(responseStr); 311 OSD responseOSD = OSDParser.Deserialize(responseStr);
310 if (responseOSD.Type == OSDType.Map) 312 if (responseOSD.Type == OSDType.Map)
311 { 313 {
@@ -317,12 +319,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
317 } 319 }
318 else 320 else
319 { 321 {
320 errorMessage = "Response format was invalid."; 322 errorMessage = "Response format was invalid:\n" + responseStr;
321 } 323 }
322 } 324 }
323 catch 325 catch (Exception ex)
324 { 326 {
325 errorMessage = "Failed to parse the response."; 327 if (!String.IsNullOrEmpty(responseStr))
328 errorMessage = "Failed to parse the response:\n" + responseStr;
329 else
330 errorMessage = "Failed to retrieve the response: " + ex.Message;
326 } 331 }
327 } 332 }
328 } 333 }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 7b25274..c333b5c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -405,9 +405,9 @@ namespace OpenSim.Services.LLLoginService
405 } 405 }
406 else 406 else
407 { 407 {
408 position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), 408 position = new Vector3(float.Parse(uriMatch.Groups["x"].Value, Culture.NumberFormatInfo),
409 float.Parse(uriMatch.Groups["y"].Value), 409 float.Parse(uriMatch.Groups["y"].Value, Culture.NumberFormatInfo),
410 float.Parse(uriMatch.Groups["z"].Value)); 410 float.Parse(uriMatch.Groups["z"].Value, Culture.NumberFormatInfo));
411 411
412 string regionName = uriMatch.Groups["region"].ToString(); 412 string regionName = uriMatch.Groups["region"].ToString();
413 if (regionName != null) 413 if (regionName != null)
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/Robust.HG.ini.example
index 5e3f9a7..5e3f9a7 100644
--- a/bin/OpenSim.Server.HG.ini.example
+++ b/bin/Robust.HG.ini.example
diff --git a/bin/OpenSim.Server.exe.config b/bin/Robust.exe.config
index c2d93c0..c2d93c0 100644
--- a/bin/OpenSim.Server.exe.config
+++ b/bin/Robust.exe.config
diff --git a/bin/OpenSim.Server.ini.example b/bin/Robust.ini.example
index 9bedac6..9bedac6 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/Robust.ini.example
diff --git a/prebuild.xml b/prebuild.xml
index 406d57e..602750a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1299,7 +1299,7 @@
1299 </Project> 1299 </Project>
1300 1300
1301 1301
1302 <Project frameworkVersion="v3_5" name="OpenSim.Server" path="OpenSim/Server" type="Exe"> 1302 <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe">
1303 <Configuration name="Debug"> 1303 <Configuration name="Debug">
1304 <Options> 1304 <Options>
1305 <OutputPath>../../bin/</OutputPath> 1305 <OutputPath>../../bin/</OutputPath>