diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Framework/Communications/Capabilities/LLSDArray.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC-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/Framework/Communications/Capabilities/LLSDArray.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDArray.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs index 668ca79..3579cc2 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDArray.cs | |||
@@ -30,11 +30,11 @@ using System.Collections; | |||
30 | namespace OpenSim.Framework.Communications.Capabilities | 30 | namespace OpenSim.Framework.Communications.Capabilities |
31 | { | 31 | { |
32 | [LLSDType("ARRAY")] | 32 | [LLSDType("ARRAY")] |
33 | public class OSDArray | 33 | public class LLSDArray |
34 | { | 34 | { |
35 | public ArrayList Array = new ArrayList(); | 35 | public ArrayList Array = new ArrayList(); |
36 | 36 | ||
37 | public OSDArray() | 37 | public LLSDArray() |
38 | { | 38 | { |
39 | } | 39 | } |
40 | } | 40 | } |