diff options
author | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 21:00:34 +0000 |
commit | c25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch) | |
tree | 775133790681153be9edc6d640162271750a1fd0 /OpenSim/Region/DataSnapshot | |
parent | * minor: add interface version to 'show version' command output (diff) | |
download | opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2 opensim-SC_OLD-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz |
* Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch.
* Appears to be okay on a very short sniff test
* Source code will be placed in opensim-libs shortly
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 8030b59..878aa4b 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.DataSnapshot | |||
77 | { | 77 | { |
78 | //Very static for now, flexible enough to add new formats | 78 | //Very static for now, flexible enough to add new formats |
79 | LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse(); | 79 | LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse(); |
80 | llsd_response.snapshot_resources = new LLSDArray(); | 80 | llsd_response.snapshot_resources = new OSDArray(); |
81 | 81 | ||
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"; |
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs index e1d7ac3..73e41ee 100644 --- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs +++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | |||
@@ -30,13 +30,13 @@ using OpenSim.Framework.Communications.Capabilities; | |||
30 | 30 | ||
31 | namespace OpenSim.Region.DataSnapshot | 31 | namespace OpenSim.Region.DataSnapshot |
32 | { | 32 | { |
33 | [LLSDMap] | 33 | [OSDMap] |
34 | public class LLSDDiscoveryResponse | 34 | public class LLSDDiscoveryResponse |
35 | { | 35 | { |
36 | public LLSDArray snapshot_resources; | 36 | public OSDArray snapshot_resources; |
37 | } | 37 | } |
38 | 38 | ||
39 | [LLSDMap] | 39 | [OSDMap] |
40 | public class LLSDDiscoveryDataURL | 40 | public class LLSDDiscoveryDataURL |
41 | { | 41 | { |
42 | public string snapshot_format; | 42 | public string snapshot_format; |