diff options
| author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
| commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
| tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | |
| parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
| download | opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2 opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz | |
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to 'OpenSim/Region/DataSnapshot/LLSDDiscovery.cs')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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; |