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/AssetServer/RestService.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/AssetServer/RestService.cs')
-rw-r--r-- | OpenSim/Grid/AssetServer/RestService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index f63b78b..457142f 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs | |||
@@ -32,7 +32,7 @@ using System.Reflection; | |||
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Xml; | 33 | using System.Xml; |
34 | using System.Xml.Serialization; | 34 | using System.Xml.Serialization; |
35 | using libsecondlife; | 35 | using OpenMetaverse; |
36 | using log4net; | 36 | using log4net; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
@@ -70,9 +70,9 @@ namespace OpenSim.Grid.AssetServer | |||
70 | 70 | ||
71 | if (p.Length > 0) | 71 | if (p.Length > 0) |
72 | { | 72 | { |
73 | LLUUID assetID = null; | 73 | UUID assetID = null; |
74 | 74 | ||
75 | if (!LLUUID.TryParse(p[0], out assetID)) | 75 | if (!UUID.TryParse(p[0], out assetID)) |
76 | { | 76 | { |
77 | m_log.InfoFormat( | 77 | m_log.InfoFormat( |
78 | "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); | 78 | "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); |
@@ -128,9 +128,9 @@ namespace OpenSim.Grid.AssetServer | |||
128 | { | 128 | { |
129 | string param = GetParam(path); | 129 | string param = GetParam(path); |
130 | 130 | ||
131 | LLUUID assetId; | 131 | UUID assetId; |
132 | if (param.Length > 0) | 132 | if (param.Length > 0) |
133 | LLUUID.TryParse(param, out assetId); | 133 | UUID.TryParse(param, out assetId); |
134 | // byte[] txBuffer = new byte[4096]; | 134 | // byte[] txBuffer = new byte[4096]; |
135 | 135 | ||
136 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); | 136 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); |