diff options
author | Justin Clarke Casey | 2009-05-25 19:54:47 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-25 19:54:47 +0000 |
commit | 582c20b1c4fb669884f0e2804487dd050f779f2b (patch) | |
tree | 3152941227a4445f08fa2ff5941890c447b3dfca /OpenSim/Framework/Servers | |
parent | One more utility. Not used yet. (diff) | |
download | opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.zip opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.tar.gz opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.tar.bz2 opensim-SC_OLD-582c20b1c4fb669884f0e2804487dd050f779f2b.tar.xz |
* reseparate inventory item creator id and creator uuid
* unfortunately, while the client requires uuids and we want to be able to have arbitrary string ids, these cannot be kept in sync
* I think the problems last time were due to a serialization change
* So the major inteface version has been bumped to take care of any lingering issues here.
* This means that region servers beyond this revision can only connect to similarly uptodate grid services, and vice versa
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs index f5e4248..ec2f9ec 100644 --- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs +++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs | |||
@@ -236,10 +236,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
236 | /// <summary> | 236 | /// <summary> |
237 | /// The operation to perform once trust has been established. | 237 | /// The operation to perform once trust has been established. |
238 | /// </summary> | 238 | /// </summary> |
239 | /// <param name="httpMethod"></param> | ||
240 | /// <param name="path"></param> | ||
241 | /// <param name="method"></param> | ||
242 | /// <param name="tmethod"></param> | ||
243 | private RestDeserialiseMethod<TRequest, TResponse> m_method; | 239 | private RestDeserialiseMethod<TRequest, TResponse> m_method; |
244 | 240 | ||
245 | /// <summary> | 241 | /// <summary> |
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 7ed3b96..c16a7f4 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
@@ -48,6 +48,6 @@ namespace OpenSim | |||
48 | /// of the code that is too old. | 48 | /// of the code that is too old. |
49 | /// | 49 | /// |
50 | /// </value> | 50 | /// </value> |
51 | public readonly static int MajorInterfaceVersion = 3; | 51 | public readonly static int MajorInterfaceVersion = 4; |
52 | } | 52 | } |
53 | } | 53 | } |