diff options
author | opensim mirror account | 2010-10-29 19:10:04 -0700 |
---|---|---|
committer | opensim mirror account | 2010-10-29 19:10:04 -0700 |
commit | 9beefc4ea98bf099dfb03948b90d0c67469ef744 (patch) | |
tree | 5afbce81eb5359f8beaeaef3f7c30518e689f4f6 | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-9beefc4ea98bf099dfb03948b90d0c67469ef744.zip opensim-SC-9beefc4ea98bf099dfb03948b90d0c67469ef744.tar.gz opensim-SC-9beefc4ea98bf099dfb03948b90d0c67469ef744.tar.bz2 opensim-SC-9beefc4ea98bf099dfb03948b90d0c67469ef744.tar.xz |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 22 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 4 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 4 |
3 files changed, 5 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 9080e1c..d81703a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -173,28 +173,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
173 | 173 | ||
174 | InventoryCollection contents | 174 | InventoryCollection contents |
175 | = m_scene.InventoryService.GetFolderContent(inventoryFolder.Owner, inventoryFolder.ID); | 175 | = m_scene.InventoryService.GetFolderContent(inventoryFolder.Owner, inventoryFolder.ID); |
176 | //List<InventoryFolderImpl> childFolders = inventoryFolder.RequestListOfFolderImpls(); | ||
177 | //List<InventoryItemBase> items = inventoryFolder.RequestListOfItems(); | ||
178 | |||
179 | /* | ||
180 | Dictionary identicalFolderNames = new Dictionary<string, int>(); | ||
181 | |||
182 | foreach (InventoryFolderImpl folder in inventories) | ||
183 | { | ||
184 | if (!identicalFolderNames.ContainsKey(folder.Name)) | ||
185 | identicalFolderNames[folder.Name] = 0; | ||
186 | else | ||
187 | identicalFolderNames[folder.Name] = identicalFolderNames[folder.Name]++; | ||
188 | |||
189 | int folderNameNumber = identicalFolderName[folder.Name]; | ||
190 | |||
191 | SaveInvDir( | ||
192 | folder, | ||
193 | string.Format( | ||
194 | "{0}{1}{2}/", | ||
195 | path, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, folderNameNumber)); | ||
196 | } | ||
197 | */ | ||
198 | 176 | ||
199 | foreach (InventoryFolderBase childFolder in contents.Folders) | 177 | foreach (InventoryFolderBase childFolder in contents.Folders) |
200 | { | 178 | { |
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index b81642a..e1627c0 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -64,7 +64,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
64 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 64 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
65 | ; Realm = "regions" | 65 | ; Realm = "regions" |
66 | ; AllowDuplicateNames = "True" | 66 | ; AllowDuplicateNames = "True" |
67 | ; Check4096 = "False" | 67 | |
68 | ;; Perform distance check for the creation of a linked region | ||
69 | ; Check4096 = "True" | ||
68 | 70 | ||
69 | ;; Next, we can specify properties of regions, including default and fallback regions | 71 | ;; Next, we can specify properties of regions, including default and fallback regions |
70 | ;; The syntax is: Region_<RegionName> = "<flags>" | 72 | ;; The syntax is: Region_<RegionName> = "<flags>" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 2f021d5..1fcf043 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -53,8 +53,8 @@ | |||
53 | ;;--- For MySql region storage (alternative) | 53 | ;;--- For MySql region storage (alternative) |
54 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" | 54 | ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" |
55 | 55 | ||
56 | ; If HG, do you want this check on the distance to be performed? | 56 | ;; With hypergrid, perform distance check for the creation of a linked region |
57 | ; Check4096 = "False" | 57 | ; Check4096 = true |
58 | 58 | ||
59 | ;; Next, we can specify properties of regions, including default and fallback regions | 59 | ;; Next, we can specify properties of regions, including default and fallback regions |
60 | ;; The syntax is: Region_<RegioName> = "<flags>" | 60 | ;; The syntax is: Region_<RegioName> = "<flags>" |