aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/HGInventoryService.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/HypergridService/HGInventoryService.cs27
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index 2e9bd40..9158b41 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -81,10 +81,8 @@ namespace OpenSim.Services.HypergridService
81 if (m_UserAccountService == null) 81 if (m_UserAccountService == null)
82 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); 82 throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
83 83
84 // legacy configuration [obsolete] 84 m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
85 m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty); 85 new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty);
86 // Preferred
87 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
88 86
89 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); 87 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
90 } 88 }
@@ -105,12 +103,6 @@ namespace OpenSim.Services.HypergridService
105 return new List<InventoryFolderBase>(); 103 return new List<InventoryFolderBase>();
106 } 104 }
107 105
108 public override InventoryCollection GetUserInventory(UUID userID)
109 {
110 // NOGO for this inventory service
111 return null;
112 }
113
114 public override InventoryFolderBase GetRootFolder(UUID principalID) 106 public override InventoryFolderBase GetRootFolder(UUID principalID)
115 { 107 {
116 //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetRootFolder for {0}", principalID); 108 //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
@@ -123,7 +115,7 @@ namespace OpenSim.Services.HypergridService
123 return ConvertToOpenSim(folders[0]); 115 return ConvertToOpenSim(folders[0]);
124 116
125 // make one 117 // make one
126 XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "My Suitcase"); 118 XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase");
127 return ConvertToOpenSim(suitcase); 119 return ConvertToOpenSim(suitcase);
128 } 120 }
129 121
@@ -149,7 +141,7 @@ namespace OpenSim.Services.HypergridService
149 //} 141 //}
150 142
151 143
152 public override InventoryFolderBase GetFolderForType(UUID principalID, AssetType type) 144 public override InventoryFolderBase GetFolderForType(UUID principalID, FolderType type)
153 { 145 {
154 //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type); 146 //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type);
155 return GetRootFolder(principalID); 147 return GetRootFolder(principalID);
@@ -161,7 +153,14 @@ namespace OpenSim.Services.HypergridService
161 //public InventoryCollection GetFolderContent(UUID principalID, UUID folderID) 153 //public InventoryCollection GetFolderContent(UUID principalID, UUID folderID)
162 //{ 154 //{
163 //} 155 //}
164 156
157 // NOGO
158 //
159 public override InventoryCollection[] GetMultipleFoldersContent(UUID principalID, UUID[] folderID)
160 {
161 return new InventoryCollection[0];
162 }
163
165 //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) 164 //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
166 //{ 165 //{
167 //} 166 //}
@@ -300,7 +299,7 @@ namespace OpenSim.Services.HypergridService
300 UserAccount user = m_Cache.GetUser(it.CreatorId); 299 UserAccount user = m_Cache.GetUser(it.CreatorId);
301 300
302 // Adjust the creator data 301 // Adjust the creator data
303 if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) 302 if (user != null && it != null && string.IsNullOrEmpty(it.CreatorData))
304 it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; 303 it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
305 } 304 }
306 return it; 305 return it;