aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs9
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs9
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteUserData.cs27
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs9
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs1
-rw-r--r--OpenSim/Region/ClientStack/PacketServer.cs1
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs4
10 files changed, 27 insertions, 42 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index b901008..0e5e782 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.UserManagement
206 /// <summary> 206 /// <summary>
207 /// Loads a user agent by uuid (not called directly) 207 /// Loads a user agent by uuid (not called directly)
208 /// </summary> 208 /// </summary>
209 /// <param name="uuid">The agents UUID</param> 209 /// <param name="uuid">The agent's UUID</param>
210 /// <returns>Agent profiles</returns> 210 /// <returns>Agent profiles</returns>
211 public UserAgentData getUserAgent(LLUUID uuid) 211 public UserAgentData getUserAgent(LLUUID uuid)
212 { 212 {
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.UserManagement
228 /// <summary> 228 /// <summary>
229 /// Loads a user agent by name (not called directly) 229 /// Loads a user agent by name (not called directly)
230 /// </summary> 230 /// </summary>
231 /// <param name="name">The agents name</param> 231 /// <param name="name">The agent's name</param>
232 /// <returns>A user agent</returns> 232 /// <returns>A user agent</returns>
233 public UserAgentData getUserAgent(string name) 233 public UserAgentData getUserAgent(string name)
234 { 234 {
@@ -256,12 +256,11 @@ namespace OpenSim.Framework.UserManagement
256 setUserProfile(profile); 256 setUserProfile(profile);
257 } 257 }
258 258
259
260 /// <summary> 259 /// <summary>
261 /// Loads a user agent by name (not called directly) 260 /// Loads a user agent by name (not called directly)
262 /// </summary> 261 /// </summary>
263 /// <param name="fname">The agents firstname</param> 262 /// <param name="fname">The agent's firstname</param>
264 /// <param name="lname">The agents lastname</param> 263 /// <param name="lname">The agent's lastname</param>
265 /// <returns>A user agent</returns> 264 /// <returns>A user agent</returns>
266 public UserAgentData getUserAgent(string fname, string lname) 265 public UserAgentData getUserAgent(string fname, string lname)
267 { 266 {
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index c21f899..e5cbe45 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Framework.Data.MySQL
158 return null; 158 return null;
159 } 159 }
160 } 160 }
161
161 public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 162 public List<OpenSim.Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
162 { 163 {
163 List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>(); 164 List<OpenSim.Framework.AvatarPickerAvatar> returnlist = new List<OpenSim.Framework.AvatarPickerAvatar>();
@@ -242,6 +243,7 @@ namespace OpenSim.Framework.Data.MySQL
242 } 243 }
243 return returnlist; 244 return returnlist;
244 } 245 }
246
245 /// <summary> 247 /// <summary>
246 /// Searches the database for a specified user profile by UUID 248 /// Searches the database for a specified user profile by UUID
247 /// </summary> 249 /// </summary>
@@ -366,11 +368,14 @@ namespace OpenSim.Framework.Data.MySQL
366 // Do nothing. 368 // Do nothing.
367 } 369 }
368 370
369 371 /// <summary>
372 /// Updates a user profile stored in the DB
373 /// </summary>
374 /// <param name="user">The profile data to use to update the DB</param>
370 public bool UpdateUserProfile(UserProfileData user) 375 public bool UpdateUserProfile(UserProfileData user)
371 { 376 {
372 return true;
373 // TODO: implement 377 // TODO: implement
378 return true;
374 } 379 }
375 380
376 /// <summary> 381 /// <summary>
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index ddc0694..b9a1daa 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -82,7 +82,6 @@ namespace OpenSim.Framework.Data.SQLite
82 MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions"); 82 MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions");
83 83
84 ds.AcceptChanges(); 84 ds.AcceptChanges();
85 return;
86 } 85 }
87 86
88 public InventoryItemBase buildItem(DataRow row) 87 public InventoryItemBase buildItem(DataRow row)
@@ -377,7 +376,7 @@ namespace OpenSim.Framework.Data.SQLite
377 /// Delete all items in the specified folder 376 /// Delete all items in the specified folder
378 /// </summary> 377 /// </summary>
379 /// <param name="folderId">id of the folder, whose item content should be deleted</param> 378 /// <param name="folderId">id of the folder, whose item content should be deleted</param>
380 //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementatio 379 //!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementation
381 private void deleteItemsInFolder(LLUUID folderId) 380 private void deleteItemsInFolder(LLUUID folderId)
382 { 381 {
383 List<InventoryItemBase> items = getInventoryInFolder(folderId); 382 List<InventoryItemBase> items = getInventoryInFolder(folderId);
@@ -404,7 +403,6 @@ namespace OpenSim.Framework.Data.SQLite
404 addFolder(folder); 403 addFolder(folder);
405 } 404 }
406 405
407
408 /// <summary> 406 /// <summary>
409 /// Delete a folder 407 /// Delete a folder
410 /// </summary> 408 /// </summary>
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index d7f4b85..da27277 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -33,14 +33,11 @@ using Mono.Data.SqliteClient;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35 35
36
37namespace OpenSim.Framework.Data.SQLite 36namespace OpenSim.Framework.Data.SQLite
38{ 37{
39 /// <summary> 38 /// <summary>
40 /// A User storage interface for the DB4o database system 39 /// A User storage interface for the SQLite database system
41 /// </summary> 40 /// </summary>
42 ///
43
44 41
45 public class SQLiteUserData : SQLiteBase, IUserData 42 public class SQLiteUserData : SQLiteBase, IUserData
46 { 43 {
@@ -78,7 +75,7 @@ namespace OpenSim.Framework.Data.SQLite
78 /// <summary> 75 /// <summary>
79 /// Loads a specified user profile from a UUID 76 /// Loads a specified user profile from a UUID
80 /// </summary> 77 /// </summary>
81 /// <param name="uuid">The users UUID</param> 78 /// <param name="uuid">The user's UUID</param>
82 /// <returns>A user profile</returns> 79 /// <returns>A user profile</returns>
83 public UserProfileData GetUserByUUID(LLUUID uuid) 80 public UserProfileData GetUserByUUID(LLUUID uuid)
84 { 81 {
@@ -105,8 +102,8 @@ namespace OpenSim.Framework.Data.SQLite
105 /// <summary> 102 /// <summary>
106 /// Returns a user by searching for its name 103 /// Returns a user by searching for its name
107 /// </summary> 104 /// </summary>
108 /// <param name="name">The users account name</param> 105 /// <param name="name">The user's account name</param>
109 /// <returns>A matching users profile</returns> 106 /// <returns>A matching user profile</returns>
110 public UserProfileData GetUserByName(string name) 107 public UserProfileData GetUserByName(string name)
111 { 108 {
112 return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]); 109 return GetUserByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -115,9 +112,9 @@ namespace OpenSim.Framework.Data.SQLite
115 /// <summary> 112 /// <summary>
116 /// Returns a user by searching for its name 113 /// Returns a user by searching for its name
117 /// </summary> 114 /// </summary>
118 /// <param name="fname">The first part of the users account name</param> 115 /// <param name="fname">The first part of the user's account name</param>
119 /// <param name="lname">The second part of the users account name</param> 116 /// <param name="lname">The second part of the user's account name</param>
120 /// <returns>A matching users profile</returns> 117 /// <returns>A matching user profile</returns>
121 public UserProfileData GetUserByName(string fname, string lname) 118 public UserProfileData GetUserByName(string fname, string lname)
122 { 119 {
123 string select = "surname = '" + lname + "' and username = '" + fname + "'"; 120 string select = "surname = '" + lname + "' and username = '" + fname + "'";
@@ -191,8 +188,8 @@ namespace OpenSim.Framework.Data.SQLite
191 /// <summary> 188 /// <summary>
192 /// Returns a user by UUID direct 189 /// Returns a user by UUID direct
193 /// </summary> 190 /// </summary>
194 /// <param name="uuid">The users account ID</param> 191 /// <param name="uuid">The user's account ID</param>
195 /// <returns>A matching users profile</returns> 192 /// <returns>A matching user profile</returns>
196 public UserAgentData GetAgentByUUID(LLUUID uuid) 193 public UserAgentData GetAgentByUUID(LLUUID uuid)
197 { 194 {
198 try 195 try
@@ -209,7 +206,7 @@ namespace OpenSim.Framework.Data.SQLite
209 /// Returns a session by account name 206 /// Returns a session by account name
210 /// </summary> 207 /// </summary>
211 /// <param name="name">The account name</param> 208 /// <param name="name">The account name</param>
212 /// <returns>The users session agent</returns> 209 /// <returns>The user's session agent</returns>
213 public UserAgentData GetAgentByName(string name) 210 public UserAgentData GetAgentByName(string name)
214 { 211 {
215 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); 212 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
@@ -218,8 +215,8 @@ namespace OpenSim.Framework.Data.SQLite
218 /// <summary> 215 /// <summary>
219 /// Returns a session by account name 216 /// Returns a session by account name
220 /// </summary> 217 /// </summary>
221 /// <param name="fname">The first part of the users account name</param> 218 /// <param name="fname">The first part of the user's account name</param>
222 /// <param name="lname">The second part of the users account name</param> 219 /// <param name="lname">The second part of the user's account name</param>
223 /// <returns>A user agent</returns> 220 /// <returns>A user agent</returns>
224 public UserAgentData GetAgentByName(string fname, string lname) 221 public UserAgentData GetAgentByName(string fname, string lname)
225 { 222 {
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1471f89..542c5cd 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -164,20 +164,13 @@ namespace OpenSim
164 config.Set("physics", "basicphysics"); 164 config.Set("physics", "basicphysics");
165 config.Set("verbose", true); 165 config.Set("verbose", true);
166 config.Set("physical_prim", true); 166 config.Set("physical_prim", true);
167
168 config.Set("child_get_tasks", false); 167 config.Set("child_get_tasks", false);
169
170 config.Set("serverside_object_permissions", false); 168 config.Set("serverside_object_permissions", false);
171
172 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll"); 169 config.Set("storage_plugin", "OpenSim.DataStore.NullStorage.dll");
173
174 config.Set("startup_console_commands_file", ""); 170 config.Set("startup_console_commands_file", "");
175 config.Set("shutdown_console_commands_file", ""); 171 config.Set("shutdown_console_commands_file", "");
176
177 config.Set("script_engine", "DotNetEngine"); 172 config.Set("script_engine", "DotNetEngine");
178
179 config.Set("asset_database", "sqlite"); 173 config.Set("asset_database", "sqlite");
180
181 } 174 }
182 175
183 if (m_config.Configs["StandAlone"] == null) 176 if (m_config.Configs["StandAlone"] == null)
@@ -201,7 +194,6 @@ namespace OpenSim
201 { 194 {
202 config.Set("default_location_x", 1000); 195 config.Set("default_location_x", 1000);
203 config.Set("default_location_y", 1000); 196 config.Set("default_location_y", 1000);
204
205 config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort); 197 config.Set("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort);
206 config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); 198 config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort);
207 config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); 199 config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
@@ -214,7 +206,6 @@ namespace OpenSim
214 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); 206 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
215 } 207 }
216 208
217
218 if (m_config.Configs["RemoteAdmin"] == null) 209 if (m_config.Configs["RemoteAdmin"] == null)
219 m_config.AddConfig("RemoteAdmin"); 210 m_config.AddConfig("RemoteAdmin");
220 config = m_config.Configs["RemoteAdmin"]; 211 config = m_config.Configs["RemoteAdmin"];
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 653077f..0514df5 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -202,7 +202,6 @@ namespace OpenSim.Region.ClientStack
202 202
203 # region Client Methods 203 # region Client Methods
204 204
205
206 public void Close() 205 public void Close()
207 { 206 {
208 // Pull Client out of Region 207 // Pull Client out of Region
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index e56a0b8..945bb82 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -104,7 +104,6 @@ namespace OpenSim.Region.ClientStack
104 CloseClient(client); 104 CloseClient(client);
105 } 105 }
106 106
107
108 /// <summary> 107 /// <summary>
109 /// 108 ///
110 /// </summary> 109 /// </summary>
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 82a5c3c..fd7e04f 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -128,8 +128,8 @@ namespace OpenSim.Region.ClientStack
128 { 128 {
129 masterAvatar = 129 masterAvatar =
130 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, 130 m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName,
131 scene.RegionInfo.MasterAvatarLastName, 131 scene.RegionInfo.MasterAvatarLastName,
132 scene.RegionInfo.MasterAvatarSandboxPassword); 132 scene.RegionInfo.MasterAvatarSandboxPassword);
133 } 133 }
134 134
135 if (masterAvatar != null) 135 if (masterAvatar != null)
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 21e4359..8095646 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -71,6 +71,7 @@ namespace OpenSim.Region.ClientStack
71 } 71 }
72 72
73 } 73 }
74
74 public ulong RegionHandle 75 public ulong RegionHandle
75 { 76 {
76 get 77 get
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index 86ddfaf..0b95aee 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -67,7 +67,6 @@ namespace OpenSim.Region.Environment.Modules
67 } 67 }
68 } 68 }
69 69
70
71 public void Initialise(Scene scene, IConfigSource source) 70 public void Initialise(Scene scene, IConfigSource source)
72 { 71 {
73 scene.RegisterModuleInterface<IAvatarFactory>(this); 72 scene.RegisterModuleInterface<IAvatarFactory>(this);
@@ -136,7 +135,6 @@ namespace OpenSim.Region.Environment.Modules
136 avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID; 135 avatAppearance.Wearables[wear.Type].ItemID = wear.ItemID;
137 } 136 }
138 } 137 }
139
140 } 138 }
141 } 139 }
142 } 140 }
@@ -159,7 +157,5 @@ namespace OpenSim.Region.Environment.Modules
159 } 157 }
160 return visualParams; 158 return visualParams;
161 } 159 }
162
163
164 } 160 }
165} 161}