diff options
Diffstat (limited to '')
4 files changed, 177 insertions, 177 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 5c739af..c3f8d2b 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -1,66 +1,66 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Region.Environment.Scenes; | 28 | using OpenSim.Region.Environment.Scenes; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using log4net; | 30 | using log4net; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 32 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// Handles an individual archive read request | 35 | /// Handles an individual archive read request |
36 | /// </summary> | 36 | /// </summary> |
37 | public class ArchiveReadRequest | 37 | public class ArchiveReadRequest |
38 | { | 38 | { |
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | private Scene m_scene; | 41 | private Scene m_scene; |
42 | private string m_loadPath; | 42 | private string m_loadPath; |
43 | 43 | ||
44 | public ArchiveReadRequest(Scene scene, string loadPath) | 44 | public ArchiveReadRequest(Scene scene, string loadPath) |
45 | { | 45 | { |
46 | m_scene = scene; | 46 | m_scene = scene; |
47 | m_loadPath = loadPath; | 47 | m_loadPath = loadPath; |
48 | 48 | ||
49 | DearchiveRegion(); | 49 | DearchiveRegion(); |
50 | } | 50 | } |
51 | 51 | ||
52 | protected void DearchiveRegion() | 52 | protected void DearchiveRegion() |
53 | { | 53 | { |
54 | TarArchiveReader archive = new TarArchiveReader(m_loadPath); | 54 | TarArchiveReader archive = new TarArchiveReader(m_loadPath); |
55 | 55 | ||
56 | // Just test for now by reading first file | 56 | // Just test for now by reading first file |
57 | string filePath = "ERROR"; | 57 | string filePath = "ERROR"; |
58 | 58 | ||
59 | byte[] data = archive.Read(out filePath); | 59 | byte[] data = archive.Read(out filePath); |
60 | 60 | ||
61 | m_log.DebugFormat("[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath); | 61 | m_log.DebugFormat("[ARCHIVER]: Successfully read {0} ({1} bytes) from archive {2}", filePath, data.Length, m_loadPath); |
62 | 62 | ||
63 | archive.Close(); | 63 | archive.Close(); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | } | 66 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs index e785c6c..80641e3 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs | |||
@@ -1,108 +1,108 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSim Project nor the | 12 | * * Neither the name of the OpenSim Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | //using System.Reflection; | 30 | //using System.Reflection; |
31 | //using log4net; | 31 | //using log4net; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Modules.World.Archiver | 33 | namespace OpenSim.Region.Environment.Modules.World.Archiver |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// Temporary code to do the bare minimum required to read a tar archive for our purposes | 36 | /// Temporary code to do the bare minimum required to read a tar archive for our purposes |
37 | /// </summary> | 37 | /// </summary> |
38 | public class TarArchiveReader | 38 | public class TarArchiveReader |
39 | { | 39 | { |
40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
42 | protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); | 42 | protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
45 | /// Binary reader for the underlying stream | 45 | /// Binary reader for the underlying stream |
46 | /// </summary> | 46 | /// </summary> |
47 | protected BinaryReader m_br; | 47 | protected BinaryReader m_br; |
48 | 48 | ||
49 | public TarArchiveReader(string archivePath) | 49 | public TarArchiveReader(string archivePath) |
50 | { | 50 | { |
51 | m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open)); | 51 | m_br = new BinaryReader(new FileStream(archivePath, FileMode.Open)); |
52 | } | 52 | } |
53 | 53 | ||
54 | public byte[] Read(out string filePath) | 54 | public byte[] Read(out string filePath) |
55 | { | 55 | { |
56 | TarHeader header = ReadHeader(); | 56 | TarHeader header = ReadHeader(); |
57 | filePath = header.FilePath; | 57 | filePath = header.FilePath; |
58 | return m_br.ReadBytes(header.FileSize); | 58 | return m_br.ReadBytes(header.FileSize); |
59 | } | 59 | } |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
62 | /// Read the next 512 byte chunk of data as a tar header. | 62 | /// Read the next 512 byte chunk of data as a tar header. |
63 | /// </summary> | 63 | /// </summary> |
64 | /// <returns>A tar header struct</returns> | 64 | /// <returns>A tar header struct</returns> |
65 | protected TarHeader ReadHeader() | 65 | protected TarHeader ReadHeader() |
66 | { | 66 | { |
67 | TarHeader tarHeader = new TarHeader(); | 67 | TarHeader tarHeader = new TarHeader(); |
68 | 68 | ||
69 | byte[] header = m_br.ReadBytes(512); | 69 | byte[] header = m_br.ReadBytes(512); |
70 | 70 | ||
71 | tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100); | 71 | tarHeader.FilePath = m_asciiEncoding.GetString(header, 0, 100); |
72 | tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11); | 72 | tarHeader.FileSize = ConvertOctalBytesToDecimal(header, 124, 11); |
73 | 73 | ||
74 | return tarHeader; | 74 | return tarHeader; |
75 | } | 75 | } |
76 | 76 | ||
77 | public void Close() | 77 | public void Close() |
78 | { | 78 | { |
79 | m_br.Close(); | 79 | m_br.Close(); |
80 | } | 80 | } |
81 | 81 | ||
82 | /// <summary> | 82 | /// <summary> |
83 | /// Convert octal bytes to a decimal representation | 83 | /// Convert octal bytes to a decimal representation |
84 | /// </summary> | 84 | /// </summary> |
85 | /// <param name="bytes"></param> | 85 | /// <param name="bytes"></param> |
86 | /// <returns></returns> | 86 | /// <returns></returns> |
87 | public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count) | 87 | public static int ConvertOctalBytesToDecimal(byte[] bytes, int startIndex, int count) |
88 | { | 88 | { |
89 | string oString = m_asciiEncoding.GetString(bytes, startIndex, count); | 89 | string oString = m_asciiEncoding.GetString(bytes, startIndex, count); |
90 | 90 | ||
91 | int d = 0; | 91 | int d = 0; |
92 | 92 | ||
93 | foreach (char c in oString) | 93 | foreach (char c in oString) |
94 | { | 94 | { |
95 | d <<= 3; | 95 | d <<= 3; |
96 | d |= c - '0'; | 96 | d |= c - '0'; |
97 | } | 97 | } |
98 | 98 | ||
99 | return d; | 99 | return d; |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
103 | public struct TarHeader | 103 | public struct TarHeader |
104 | { | 104 | { |
105 | public string FilePath; | 105 | public string FilePath; |
106 | public int FileSize; | 106 | public int FileSize; |
107 | } | 107 | } |
108 | } | 108 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 96ae065..ff179da 100644 --- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs | |||
@@ -357,7 +357,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate | |||
357 | else | 357 | else |
358 | { | 358 | { |
359 | lsri.OwnerName = "waiting"; | 359 | lsri.OwnerName = "waiting"; |
360 | lock(uuidNameLookupList) | 360 | lock (uuidNameLookupList) |
361 | uuidNameLookupList.Add(sog.OwnerID); | 361 | uuidNameLookupList.Add(sog.OwnerID); |
362 | } | 362 | } |
363 | 363 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index 889be97..e1358db 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Modules | |||
104 | private ulong CurrentTime | 104 | private ulong CurrentTime |
105 | { | 105 | { |
106 | get { | 106 | get { |
107 | 107 | ||
108 | return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000); | 108 | return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset)/10000000); |
109 | } | 109 | } |
110 | } | 110 | } |
@@ -346,7 +346,7 @@ namespace OpenSim.Region.Environment.Modules | |||
346 | { | 346 | { |
347 | if (m_rootAgents.ContainsKey(avatar.UUID)) | 347 | if (m_rootAgents.ContainsKey(avatar.UUID)) |
348 | { | 348 | { |
349 | m_rootAgents[avatar.UUID] = avatar.RegionHandle; | 349 | m_rootAgents[avatar.UUID] = avatar.RegionHandle; |
350 | } | 350 | } |
351 | else | 351 | else |
352 | { | 352 | { |