diff options
| author | Melanie | 2012-01-06 00:08:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-06 00:08:18 +0000 |
| commit | fdfc4ab2a8e171139caf9751a23eb75afe881c2b (patch) | |
| tree | bc0d8d3066ecf5fe87e0778e23190d14a58d3bc1 /OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |
| parent | That needs to be callable from elsewhere! (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.zip opensim-SC_OLD-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.tar.gz opensim-SC_OLD-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.tar.bz2 opensim-SC_OLD-fdfc4ab2a8e171139caf9751a23eb75afe881c2b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/DataSnapshot/DataRequestHandler.cs')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index b760454..93648d6 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |||
| @@ -67,7 +67,7 @@ namespace OpenSim.Region.DataSnapshot | |||
| 67 | 67 | ||
| 68 | public void OnRegisterCaps(UUID agentID, Caps caps) | 68 | public void OnRegisterCaps(UUID agentID, Caps caps) |
| 69 | { | 69 | { |
| 70 | m_log.Info("[DATASNAPSHOT]: Registering service discovery capability for " + agentID); | 70 | // m_log.InfoFormat("[DATASNAPSHOT]: Registering service discovery capability for {0}", agentID); |
| 71 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 71 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
| 72 | caps.RegisterHandler("PublicSnapshotDataInfo", | 72 | caps.RegisterHandler("PublicSnapshotDataInfo", |
| 73 | new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); | 73 | new RestStreamHandler("POST", capsBase + m_discoveryPath, OnDiscoveryAttempt)); |