diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Grid/MessagingServer/XMPPHTTPService.cs')
-rw-r--r-- | OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index 13bf290..3b433ba 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework.Servers; | 34 | using OpenSim.Framework.Servers; |
35 | 35 | ||
@@ -63,9 +63,9 @@ namespace OpenSim.Grid.MessagingServer | |||
63 | 63 | ||
64 | if (p.Length > 0) | 64 | if (p.Length > 0) |
65 | { | 65 | { |
66 | LLUUID assetID = null; | 66 | UUID assetID = null; |
67 | 67 | ||
68 | if (!LLUUID.TryParse(p[0], out assetID)) | 68 | if (!UUID.TryParse(p[0], out assetID)) |
69 | { | 69 | { |
70 | m_log.InfoFormat( | 70 | m_log.InfoFormat( |
71 | "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]); | 71 | "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]); |
@@ -91,9 +91,9 @@ namespace OpenSim.Grid.MessagingServer | |||
91 | { | 91 | { |
92 | string param = GetParam(path); | 92 | string param = GetParam(path); |
93 | 93 | ||
94 | LLUUID assetId; | 94 | UUID assetId; |
95 | if (param.Length > 0) | 95 | if (param.Length > 0) |
96 | LLUUID.TryParse(param, out assetId); | 96 | UUID.TryParse(param, out assetId); |
97 | // byte[] txBuffer = new byte[4096]; | 97 | // byte[] txBuffer = new byte[4096]; |
98 | 98 | ||
99 | // TODO: Read POST serialize XMPP stanzas | 99 | // TODO: Read POST serialize XMPP stanzas |