diff options
3 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index c8656d5..d3e715f 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -329,10 +329,11 @@ namespace OpenSim.Framework.Communications.Cache | |||
329 | 329 | ||
330 | /// <summary> | 330 | /// <summary> |
331 | /// Create a folder in this agent's inventory. | 331 | /// Create a folder in this agent's inventory. |
332 | /// </summary> | ||
332 | /// | 333 | /// |
333 | /// If the inventory service has not yet delievered the inventory | 334 | /// If the inventory service has not yet delievered the inventory |
334 | /// for this user then the request will be queued. | 335 | /// for this user then the request will be queued. |
335 | /// </summary> | 336 | /// |
336 | /// <param name="parentID"></param> | 337 | /// <param name="parentID"></param> |
337 | /// <returns></returns> | 338 | /// <returns></returns> |
338 | public bool CreateFolder(string folderName, UUID folderID, ushort folderType, UUID parentID) | 339 | public bool CreateFolder(string folderName, UUID folderID, ushort folderType, UUID parentID) |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index b4f3e9f..46df2b7 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -224,11 +224,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
224 | 224 | ||
225 | /// <summary> | 225 | /// <summary> |
226 | /// Handle a client request to update the inventory folder | 226 | /// Handle a client request to update the inventory folder |
227 | /// </summary> | ||
227 | /// | 228 | /// |
228 | /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE | 229 | /// FIXME: We call add new inventory folder because in the data layer, we happen to use an SQL REPLACE |
229 | /// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing, | 230 | /// so this will work to rename an existing folder. Needless to say, to rely on this is very confusing, |
230 | /// and needs to be changed. | 231 | /// and needs to be changed. |
231 | /// </summary> | 232 | /// |
232 | /// <param name="remoteClient"></param> | 233 | /// <param name="remoteClient"></param> |
233 | /// <param name="folderID"></param> | 234 | /// <param name="folderID"></param> |
234 | /// <param name="type"></param> | 235 | /// <param name="type"></param> |
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs index 5f13d01..88dd3a7 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs | |||
@@ -88,23 +88,23 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
88 | FileStream s = file.Open(FileMode.Open, FileAccess.Read); | 88 | FileStream s = file.Open(FileMode.Open, FileAccess.Read); |
89 | BinaryReader bs = new BinaryReader(s); | 89 | BinaryReader bs = new BinaryReader(s); |
90 | 90 | ||
91 | int currFileYOffset = 0; | 91 | int currFileYOffset = fileHeight - 1; |
92 | 92 | ||
93 | // if our region isn't on the first Y section of the areas to be landscaped, then | 93 | // if our region isn't on the first Y section of the areas to be landscaped, then |
94 | // advance to our section of the file | 94 | // advance to our section of the file |
95 | while (currFileYOffset < offsetY) | 95 | while (currFileYOffset > offsetY) |
96 | { | 96 | { |
97 | // read a whole strip of regions | 97 | // read a whole strip of regions |
98 | int heightsToRead = sectionHeight * (fileWidth * sectionWidth); | 98 | int heightsToRead = sectionHeight * (fileWidth * sectionWidth); |
99 | bs.ReadBytes(heightsToRead * 13); // because there are 13 fun channels | 99 | bs.ReadBytes(heightsToRead * 13); // because there are 13 fun channels |
100 | currFileYOffset++; | 100 | currFileYOffset--; |
101 | } | 101 | } |
102 | 102 | ||
103 | // got to the Y start offset within the file of our region | 103 | // got to the Y start offset within the file of our region |
104 | // so read the file bits associated with our region | 104 | // so read the file bits associated with our region |
105 | int y; | 105 | int y; |
106 | // for each Y within our Y offset | 106 | // for each Y within our Y offset |
107 | for (y = 0; y < sectionHeight; y++) | 107 | for (y = sectionHeight - 1; y >= 0; y--) |
108 | { | 108 | { |
109 | int currFileXOffset = 0; | 109 | int currFileXOffset = 0; |
110 | 110 | ||
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
155 | int x; | 155 | int x; |
156 | for (x = 0; x < retval.Width; x++) | 156 | for (x = 0; x < retval.Width; x++) |
157 | { | 157 | { |
158 | retval[x, y] = bs.ReadByte() * (bs.ReadByte() / 128.0); | 158 | retval[x, (retval.Height - 1) - y] = bs.ReadByte() * (bs.ReadByte() / 128.0); |
159 | bs.ReadBytes(11); // Advance the stream to next bytes. | 159 | bs.ReadBytes(11); // Advance the stream to next bytes. |
160 | } | 160 | } |
161 | } | 161 | } |
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders | |||
183 | { | 183 | { |
184 | for (int x = 0; x < map.Width; x++) | 184 | for (int x = 0; x < map.Width; x++) |
185 | { | 185 | { |
186 | double t = map[x, y]; | 186 | double t = map[x, (map.Height - 1) - y]; |
187 | int index = 0; | 187 | int index = 0; |
188 | 188 | ||
189 | // The lookup table is pre-sorted, so we either find an exact match or | 189 | // The lookup table is pre-sorted, so we either find an exact match or |