aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-25 16:09:43 +0000
committerTeravus Ovares2008-03-25 16:09:43 +0000
commit3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7 (patch)
tree0e6e421b696c94a8331c99782259ebce5a7b92d7 /OpenSim/Framework/Communications
parent* Refactored out circular reference in Region.Environment <-> Framework.Data.... (diff)
downloadopensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.zip
opensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.tar.gz
opensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.tar.bz2
opensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.tar.xz
* On Ray casting. Now returning the face normal of the collision face.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 194407f..cac0571 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -455,7 +455,7 @@ namespace OpenSim.Region.Capabilities
455 // "ScriptTaskInventory response: {0}", 455 // "ScriptTaskInventory response: {0}",
456 // LLSDHelpers.SerialiseLLSDReply(uploadResponse))); 456 // LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
457 457
458 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>parcel_local_id</key><integer>16</integer><key>region_name</key><string>Limbo</string><key>voice_credentials</key><map><key>channel_uri</key><string>sip:confctl-49730-1@bhr.vivox.com</string></map></map></llsd>"); 458 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>parcel_local_id</key><integer>16</integer><key>region_name</key><string>Teravus Test</string><key>voice_credentials</key><map><key>channel_uri</key><string>sip:conference@192.168.1.127\nsip:user@192.168.1.127</string></map></map></llsd>");
459 } 459 }
460 catch (Exception e) 460 catch (Exception e)
461 { 461 {
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Capabilities
501 // "ScriptTaskInventory response: {0}", 501 // "ScriptTaskInventory response: {0}",
502 // LLSDHelpers.SerialiseLLSDReply(uploadResponse))); 502 // LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
503 503
504 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>events</key><array><map><key>body</key><map><key>major_version</key><integer>1</integer><key>minor_version</key><integer>0</integer><key>region_name</key><string>Cathedral</string></map><key>message</key><string>RequiredVoiceVersion</string></map></array><key>id</key><integer>152477222</integer></map></llsd>"); 504 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>events</key><array><map><key>body</key><map><key>major_version</key><integer>1</integer><key>minor_version</key><integer>0</integer><key>region_name</key><string>Teravus Test</string></map><key>message</key><string>RequiredVoiceVersion</string></map></array><key>id</key><integer>152477222</integer></map></llsd>");
505 } 505 }
506 catch (Exception e) 506 catch (Exception e)
507 { 507 {