aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-10 16:50:11 +0000
committerJustin Clarke Casey2008-12-10 16:50:11 +0000
commit9e02a639e563ef45788ae24adf568be028e041be (patch)
treebad5d8c7c441db50b2414b8ec77cc93bebc2fbdf /OpenSim/Framework/Communications/Cache
parentApplying diva's revert patch. Reverts closing child agents and makes (diff)
downloadopensim-SC_OLD-9e02a639e563ef45788ae24adf568be028e041be.zip
opensim-SC_OLD-9e02a639e563ef45788ae24adf568be028e041be.tar.gz
opensim-SC_OLD-9e02a639e563ef45788ae24adf568be028e041be.tar.bz2
opensim-SC_OLD-9e02a639e563ef45788ae24adf568be028e041be.tar.xz
* Apply the other patch from http://opensimulator.org/mantis/view.php?id=2315
* This means that LL RAW terrains (one source being the upload/download buttons on the estate dialog in the viewer) are now imported the 'right' way around rather than being flipped on the y axis * Existing RAW terrains before this patch will need to be flipped with the "terrain flip y" command from the console after import * More details on the mailing lists soon. -This line, and those below, will be ignored-- M OpenSim/Region/Environment/Modules/World/Terrain/FileLoaders/LLRAW.cs M OpenSim/Framework/Communications/Cache/CachedUserInfo.cs M OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs3
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs3
2 files changed, 4 insertions, 2 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>