aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs2
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml1
-rw-r--r--OpenSim/Services/Interfaces/IUserService.cs14
3 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 6106d93..504563a 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -84,6 +84,8 @@ namespace OpenSim.Grid.InventoryServer
84 84
85 m_log.Info("[" + LogName + "]: Started HTTP server"); 85 m_log.Info("[" + LogName + "]: Started HTTP server");
86 86
87 new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
88
87 base.StartupSpecific(); 89 base.StartupSpecific();
88 90
89 m_console.Commands.AddCommand("inventoryserver", false, "add user", 91 m_console.Commands.AddCommand("inventoryserver", false, "add user",
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 8e85559..c0932bd 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -37,6 +37,7 @@
37 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" /> 37 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
38 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" /> 38 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
39 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \ 39 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
40 <RegionModule id="HGAuthServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.HGAuthServiceInConnectorModule" /> \
40 41
41 </Extension> 42 </Extension>
42 43
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 9bbe503..05eda97 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -30,7 +30,7 @@ using OpenMetaverse;
30 30
31namespace OpenSim.Services.Interfaces 31namespace OpenSim.Services.Interfaces
32{ 32{
33 public class UserData 33 public class UserAccountData
34 { 34 {
35 public UserData() 35 public UserData()
36 { 36 {
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Interfaces
78 78
79 }; 79 };
80 80
81 public class UserDataMessage 81 public class UserAccountDataMessage
82 { 82 {
83 public UserData Data; 83 public UserData Data;
84 84
@@ -93,10 +93,10 @@ namespace OpenSim.Services.Interfaces
93 public UUID SessionID; 93 public UUID SessionID;
94 }; 94 };
95 95
96 public interface IUserDataService 96 public interface IUserAccountDataService
97 { 97 {
98 UserData GetUserData(UUID scopeID, UUID userID); 98 UserData GetUserAccountData(UUID scopeID, UUID userID);
99 UserData GetUserData(UUID scopeID, string FirstName, string LastName); 99 UserData GetUserAccountData(UUID scopeID, string FirstName, string LastName);
100 100
101 // This will set only the home region portion of the data! 101 // This will set only the home region portion of the data!
102 // Can't be used to set god level, flags, type or change the name! 102 // Can't be used to set god level, flags, type or change the name!
@@ -105,7 +105,7 @@ namespace OpenSim.Services.Interfaces
105 105
106 // Update all updatable fields 106 // Update all updatable fields
107 // 107 //
108 bool SetUserData(UserData data, UUID PrincipalID, UUID SessionID); 108 bool SetUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
109 109
110 // Returns the list of avatars that matches both the search 110 // Returns the list of avatars that matches both the search
111 // criterion and the scope ID passed 111 // criterion and the scope ID passed
@@ -113,6 +113,6 @@ namespace OpenSim.Services.Interfaces
113 List<UserData> GetAvatarPickerData(UUID scopeID, string query); 113 List<UserData> GetAvatarPickerData(UUID scopeID, string query);
114 114
115 // Creates a user data record 115 // Creates a user data record
116 bool CreateUserData(UserData data, UUID PrincipalID, UUID SessionID); 116 bool CreateUserAccountData(UserData data, UUID PrincipalID, UUID SessionID);
117 } 117 }
118} 118}