aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-19 06:15:21 +0000
committerMelanie Thielker2008-11-19 06:15:21 +0000
commit3234472d6203671a492a73042a0b56d6301903e0 (patch)
tree2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
parentEnsure that the physics representation of a deleted object is also removed (diff)
downloadopensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and none of the issues. This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373 r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Region/DataSnapshot/LLSDDiscovery.cs')
-rw-r--r--OpenSim/Region/DataSnapshot/LLSDDiscovery.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index 73e41ee..e1d7ac3 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -30,13 +30,13 @@ using OpenSim.Framework.Communications.Capabilities;
30 30
31namespace OpenSim.Region.DataSnapshot 31namespace OpenSim.Region.DataSnapshot
32{ 32{
33 [OSDMap] 33 [LLSDMap]
34 public class LLSDDiscoveryResponse 34 public class LLSDDiscoveryResponse
35 { 35 {
36 public OSDArray snapshot_resources; 36 public LLSDArray snapshot_resources;
37 } 37 }
38 38
39 [OSDMap] 39 [LLSDMap]
40 public class LLSDDiscoveryDataURL 40 public class LLSDDiscoveryDataURL
41 { 41 {
42 public string snapshot_format; 42 public string snapshot_format;