diff options
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLInventoryData.cs')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLInventoryData.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs index dd4d804..4e8200b 100644 --- a/OpenSim/Data/MySQL/MySQLInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs | |||
@@ -48,8 +48,8 @@ namespace OpenSim.Data.MySQL | |||
48 | /// </summary> | 48 | /// </summary> |
49 | private MySQLManager database; | 49 | private MySQLManager database; |
50 | 50 | ||
51 | public void Initialise() | 51 | public void Initialise() |
52 | { | 52 | { |
53 | m_log.Info("[MySQLInventoryData]: " + Name + " cannot be default-initialized!"); | 53 | m_log.Info("[MySQLInventoryData]: " + Name + " cannot be default-initialized!"); |
54 | throw new PluginNotInitialisedException (Name); | 54 | throw new PluginNotInitialisedException (Name); |
55 | } | 55 | } |
@@ -81,7 +81,7 @@ namespace OpenSim.Data.MySQL | |||
81 | string settingPassword = GridDataMySqlFile.ParseFileReadValue("password"); | 81 | string settingPassword = GridDataMySqlFile.ParseFileReadValue("password"); |
82 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); | 82 | string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling"); |
83 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); | 83 | string settingPort = GridDataMySqlFile.ParseFileReadValue("port"); |
84 | 84 | ||
85 | database = | 85 | database = |
86 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, | 86 | new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, |
87 | settingPort); | 87 | settingPort); |
@@ -147,7 +147,7 @@ namespace OpenSim.Data.MySQL | |||
147 | } | 147 | } |
148 | 148 | ||
149 | /// <summary> | 149 | /// <summary> |
150 | /// | 150 | /// |
151 | /// </summary> | 151 | /// </summary> |
152 | /// <param name="conn">MySQL connection handler</param> | 152 | /// <param name="conn">MySQL connection handler</param> |
153 | /// <param name="m"></param> | 153 | /// <param name="m"></param> |
@@ -180,7 +180,7 @@ namespace OpenSim.Data.MySQL | |||
180 | // ... and set the version | 180 | // ... and set the version |
181 | if (m.Version == 0) | 181 | if (m.Version == 0) |
182 | m.Version = 1; | 182 | m.Version = 1; |
183 | 183 | ||
184 | } | 184 | } |
185 | 185 | ||
186 | #endregion | 186 | #endregion |
@@ -290,7 +290,7 @@ namespace OpenSim.Data.MySQL | |||
290 | } | 290 | } |
291 | } | 291 | } |
292 | 292 | ||
293 | 293 | ||
294 | /// <summary> | 294 | /// <summary> |
295 | /// see <see cref="InventoryItemBase.getUserRootFolder"/> | 295 | /// see <see cref="InventoryItemBase.getUserRootFolder"/> |
296 | /// </summary> | 296 | /// </summary> |
@@ -708,10 +708,10 @@ namespace OpenSim.Data.MySQL | |||
708 | * - We will only need to hit the database twice instead of n times. | 708 | * - We will only need to hit the database twice instead of n times. |
709 | * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned | 709 | * - We assume the database is well-formed - no stranded/dangling folders, all folders in heirarchy owned |
710 | * by the same person, each user only has 1 inventory heirarchy | 710 | * by the same person, each user only has 1 inventory heirarchy |
711 | * - The returned list is not ordered, instead of breadth-first ordered | 711 | * - The returned list is not ordered, instead of breadth-first ordered |
712 | There are basically 2 usage cases for getFolderHeirarchy: | 712 | There are basically 2 usage cases for getFolderHeirarchy: |
713 | 1) Getting the user's entire inventory heirarchy when they log in | 713 | 1) Getting the user's entire inventory heirarchy when they log in |
714 | 2) Finding a subfolder heirarchy to delete when emptying the trash. | 714 | 2) Finding a subfolder heirarchy to delete when emptying the trash. |
715 | This implementation will pull all inventory folders from the database, and then prune away any folder that | 715 | This implementation will pull all inventory folders from the database, and then prune away any folder that |
716 | is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the | 716 | is not part of the requested sub-heirarchy. The theory is that it is cheaper to make 1 request from the |
717 | database than to make n requests. This pays off only if requested heirarchy is large. | 717 | database than to make n requests. This pays off only if requested heirarchy is large. |
@@ -774,7 +774,7 @@ namespace OpenSim.Data.MySQL | |||
774 | while (reader.Read()) | 774 | while (reader.Read()) |
775 | { | 775 | { |
776 | InventoryFolderBase curFolder = readInventoryFolder(reader); | 776 | InventoryFolderBase curFolder = readInventoryFolder(reader); |
777 | if (hashtable.ContainsKey(curFolder.ParentID)) // Current folder already has a sibling | 777 | if (hashtable.ContainsKey(curFolder.ParentID)) // Current folder already has a sibling |
778 | hashtable[curFolder.ParentID].Add(curFolder); // append to sibling list | 778 | hashtable[curFolder.ParentID].Add(curFolder); // append to sibling list |
779 | else // else current folder has no known (yet) siblings | 779 | else // else current folder has no known (yet) siblings |
780 | { | 780 | { |