aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
diff options
context:
space:
mode:
authorJeff Ames2008-05-25 23:27:38 +0000
committerJeff Ames2008-05-25 23:27:38 +0000
commit5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch)
treeb010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Region/DataSnapshot/DataRequestHandler.cs
parent* A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff)
downloadopensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip
opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz
opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2
opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/DataSnapshot/DataRequestHandler.cs')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 6ecae06..7ddd072 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.DataSnapshot
60 60
61 //Register CAPS handler event 61 //Register CAPS handler event
62 m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; 62 m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
63 63
64 //harbl 64 //harbl
65 } 65 }
66 66
@@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot
72 new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); 72 new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt));
73 } 73 }
74 74
75 public string OnDiscoveryAttempt(string request, string path, string param, 75 public string OnDiscoveryAttempt(string request, string path, string param,
76 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 76 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
77 { 77 {
78 //Very static for now, flexible enough to add new formats 78 //Very static for now, flexible enough to add new formats
@@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot
82 LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL(); 82 LLSDDiscoveryDataURL llsd_dataurl = new LLSDDiscoveryDataURL();
83 llsd_dataurl.snapshot_format = "os-datasnapshot-v1"; 83 llsd_dataurl.snapshot_format = "os-datasnapshot-v1";
84 llsd_dataurl.snapshot_url = "http://" + m_externalData.m_hostname + ":" + m_externalData.m_listener_port + "/?method=collector"; 84 llsd_dataurl.snapshot_url = "http://" + m_externalData.m_hostname + ":" + m_externalData.m_listener_port + "/?method=collector";
85 85
86 llsd_response.snapshot_resources.Array.Add(llsd_dataurl); 86 llsd_response.snapshot_resources.Array.Add(llsd_dataurl);
87 87
88 string response = LLSDHelpers.SerialiseLLSDReply(llsd_response); 88 string response = LLSDHelpers.SerialiseLLSDReply(llsd_response);