aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetTransactions.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs18
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolder.cs1
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs1
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs1
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs1
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oManager.cs1
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oUserData.cs1
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs1
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs1
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLUserData.cs1
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteUserData.cs1
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs1
-rw-r--r--OpenSim/Framework/General/Interfaces/IUserData.cs (renamed from OpenSim/Framework/Data/UserData.cs)1
-rw-r--r--OpenSim/Framework/General/Interfaces/IUserService.cs2
-rw-r--r--OpenSim/Framework/General/Types/InventoryItemBase.cs (renamed from OpenSim/Framework/Data/InventoryData.cs)4
-rw-r--r--OpenSim/Framework/General/Types/UserProfileData.cs (renamed from OpenSim/Framework/Data/UserProfileData.cs)5
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs161
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs1
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs1
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs1
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs1
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs1
34 files changed, 109 insertions, 121 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index d0507d0..51fc462 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -32,10 +32,10 @@ using System.Text;
32using System.IO; 32using System.IO;
33using libsecondlife; 33using libsecondlife;
34using libsecondlife.Packets; 34using libsecondlife.Packets;
35using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Types; 37using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities; 38using OpenSim.Framework.Utilities;
38using OpenSim.Framework.Data;
39using OpenSim.Region.Capabilities; 39using OpenSim.Region.Capabilities;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41 41
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 99dc45a..b1432ff 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -25,22 +25,15 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Text;
32using System.IO;
33using libsecondlife; 28using libsecondlife;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 29using OpenSim.Framework.Types;
36using OpenSim.Framework.Data; 30using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
37using OpenSim.Framework.Utilities;
38 31
39namespace OpenSim.Framework.Communications.Caches 32namespace OpenSim.Framework.Communications.Cache
40{ 33{
41 public class CachedUserInfo 34 public class CachedUserInfo
42 { 35 {
43 private CommunicationsManager m_parentCommsManager; 36 private readonly CommunicationsManager m_parentCommsManager;
44 // Fields 37 // Fields
45 public InventoryFolder RootFolder = null; 38 public InventoryFolder RootFolder = null;
46 public UserProfileData UserProfile = null; 39 public UserProfileData UserProfile = null;
@@ -127,7 +120,4 @@ namespace OpenSim.Framework.Communications.Caches
127 return result; 120 return result;
128 } 121 }
129 } 122 }
130 123} \ No newline at end of file
131
132}
133
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
index 885cffc..fbe1bd0 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs
@@ -32,7 +32,6 @@ using System.Text;
32using System.IO; 32using System.IO;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Data;
36using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
38 37
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index deef028..38fad68 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -3,8 +3,8 @@ using System.IO;
3using System.Collections.Generic; 3using System.Collections.Generic;
4using System.Text; 4using System.Text;
5using libsecondlife; 5using libsecondlife;
6using OpenSim.Framework.Types;
6using OpenSim.Framework.Utilities; 7using OpenSim.Framework.Utilities;
7using OpenSim.Framework.Data;
8using Nini.Config; 8using Nini.Config;
9 9
10namespace OpenSim.Framework.Communications.Caches 10namespace OpenSim.Framework.Communications.Caches
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 390b938..9e32ea5 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -31,10 +31,10 @@ using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using System.IO; 32using System.IO;
33using libsecondlife; 33using libsecondlife;
34using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Data;
38 38
39namespace OpenSim.Framework.Communications.Caches 39namespace OpenSim.Framework.Communications.Caches
40{ 40{
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 59c6d7c..4ed59c7 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework.Utilities;
38using OpenSim.Framework.Data;
39 38
40namespace OpenSim.Region.Capabilities 39namespace OpenSim.Region.Capabilities
41{ 40{
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e266b90..5af07f7 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -29,7 +29,6 @@ using System;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Communications.Cache; 30using OpenSim.Framework.Communications.Cache;
31using OpenSim.Framework.Communications.Caches; 31using OpenSim.Framework.Communications.Caches;
32using OpenSim.Framework.Data;
33using OpenSim.Framework.Interfaces; 32using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
35using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 80c2e64..980bb27 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -1,9 +1,9 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Data;
5using libsecondlife; 4using libsecondlife;
6using OpenSim.Framework.Communications.Caches; 5using OpenSim.Framework.Communications.Caches;
6using OpenSim.Framework.Types;
7using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; 7using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
8 8
9namespace OpenSim.Framework.Communications 9namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index da7a0ce..7536429 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -4,7 +4,7 @@ using System.Reflection;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Communications; 5using OpenSim.Framework.Communications;
6using OpenSim.Framework.Console; 6using OpenSim.Framework.Console;
7using OpenSim.Framework.Data; 7using OpenSim.Framework.Types;
8using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; 8using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
9 9
10namespace OpenSim.Framework.Communications 10namespace OpenSim.Framework.Communications
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 8e7cf80..06abb69 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -6,9 +6,9 @@ using System.Security.Cryptography;
6using libsecondlife; 6using libsecondlife;
7using Nwc.XmlRpc; 7using Nwc.XmlRpc;
8using OpenSim.Framework.Console; 8using OpenSim.Framework.Console;
9using OpenSim.Framework.Data;
10using OpenSim.Framework.Interfaces; 9using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Inventory; 10using OpenSim.Framework.Inventory;
11using OpenSim.Framework.Types;
12using OpenSim.Framework.Utilities; 12using OpenSim.Framework.Utilities;
13 13
14using OpenSim.Framework.Configuration; 14using OpenSim.Framework.Configuration;
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index bbda054..56ed959 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -37,6 +37,7 @@ using OpenSim.Framework.Configuration;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Framework.Data; 38using OpenSim.Framework.Data;
39using OpenSim.Framework.Interfaces; 39using OpenSim.Framework.Interfaces;
40using OpenSim.Framework.Types;
40using OpenSim.Framework.Utilities; 41using OpenSim.Framework.Utilities;
41 42
42namespace OpenSim.Framework.UserManagement 43namespace OpenSim.Framework.UserManagement
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 0ab7aec..224b842 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using Db4objects.Db4o; 30using Db4objects.Db4o;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Types;
32 33
33namespace OpenSim.Framework.Data.DB4o 34namespace OpenSim.Framework.Data.DB4o
34{ 35{
diff --git a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
index 2ab1488..38f1b55 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oUserData.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Types;
31using OpenSim.Framework.Utilities; 32using OpenSim.Framework.Utilities;
32 33
33namespace OpenSim.Framework.Data.DB4o 34namespace OpenSim.Framework.Data.DB4o
diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 5009d9e..f773da4 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Types;
32 33
33namespace OpenSim.Framework.Data.MySQL 34namespace OpenSim.Framework.Data.MySQL
34{ 35{
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 5037f98..a83ee45 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using libsecondlife; 31using libsecondlife;
32using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
33using OpenSim.Framework.Types;
33 34
34namespace OpenSim.Framework.Data.MySQL 35namespace OpenSim.Framework.Data.MySQL
35{ 36{
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index e746717..301550f 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using libsecondlife; 31using libsecondlife;
32using OpenSim.Framework.Types;
32 33
33namespace OpenSim.Framework.Data.MySQL 34namespace OpenSim.Framework.Data.MySQL
34{ 35{
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
index 3a13ecc..c7b7659 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Types;
31using OpenSim.Framework.Utilities; 32using OpenSim.Framework.Utilities;
32using System.Data; 33using System.Data;
33using System.Data.SqlTypes; 34using System.Data.SqlTypes;
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 344a55c..bedea9e 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -31,7 +31,6 @@ using System.Net;
31using libsecondlife; 31using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim.Framework.Types; 33using OpenSim.Framework.Types;
34using OpenSim.Framework.Data;
35 34
36namespace OpenSim.Framework.Interfaces 35namespace OpenSim.Framework.Interfaces
37{ 36{
diff --git a/OpenSim/Framework/Data/UserData.cs b/OpenSim/Framework/General/Interfaces/IUserData.cs
index 13bdf17..bb3abe0 100644
--- a/OpenSim/Framework/Data/UserData.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserData.cs
@@ -26,6 +26,7 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework.Types;
29 30
30namespace OpenSim.Framework.Data 31namespace OpenSim.Framework.Data
31{ 32{
diff --git a/OpenSim/Framework/General/Interfaces/IUserService.cs b/OpenSim/Framework/General/Interfaces/IUserService.cs
index 974e025..461d4cb 100644
--- a/OpenSim/Framework/General/Interfaces/IUserService.cs
+++ b/OpenSim/Framework/General/Interfaces/IUserService.cs
@@ -26,7 +26,7 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework.Data; 29using OpenSim.Framework.Types;
30 30
31namespace OpenSim.Framework.Interfaces 31namespace OpenSim.Framework.Interfaces
32{ 32{
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/General/Types/InventoryItemBase.cs
index 2df26e1..e3dbe71 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/General/Types/InventoryItemBase.cs
@@ -28,7 +28,7 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Framework.Data 31namespace OpenSim.Framework.Types
32{ 32{
33 /// <summary> 33 /// <summary>
34 /// Inventory Item - contains all the properties associated with an individual inventory piece. 34 /// Inventory Item - contains all the properties associated with an individual inventory piece.
@@ -219,4 +219,4 @@ namespace OpenSim.Framework.Data
219 /// <param name="folder">The inventory folder</param> 219 /// <param name="folder">The inventory folder</param>
220 void updateInventoryFolder(InventoryFolderBase folder); 220 void updateInventoryFolder(InventoryFolderBase folder);
221 } 221 }
222} 222} \ No newline at end of file
diff --git a/OpenSim/Framework/Data/UserProfileData.cs b/OpenSim/Framework/General/Types/UserProfileData.cs
index 4fafe3f..20d8224 100644
--- a/OpenSim/Framework/Data/UserProfileData.cs
+++ b/OpenSim/Framework/General/Types/UserProfileData.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using libsecondlife; 29using libsecondlife;
30 30
31namespace OpenSim.Framework.Data 31namespace OpenSim.Framework.Types
32{ 32{
33 /// <summary> 33 /// <summary>
34 /// Information about a particular user known to the userserver 34 /// Information about a particular user known to the userserver
@@ -68,7 +68,6 @@ namespace OpenSim.Framework.Data
68 set { 68 set {
69 homeRegionX = (uint)(value >> 40); 69 homeRegionX = (uint)(value >> 40);
70 homeRegionY = (((uint)(value)) >> 8); 70 homeRegionY = (((uint)(value)) >> 8);
71 Console.WriteLine("HomeRegion => Incoming: " + value + ", Computed: " + homeRegion);
72 } 71 }
73 } 72 }
74 public uint homeRegionX; 73 public uint homeRegionX;
@@ -189,4 +188,4 @@ namespace OpenSim.Framework.Data
189 /// </summary> 188 /// </summary>
190 public LLVector3 currentPos; 189 public LLVector3 currentPos;
191 } 190 }
192} 191} \ No newline at end of file
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 95192e3..b42427b 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -1,83 +1,84 @@
1using System; 1using System;
2using System.Collections; 2using System.Collections;
3using System.Net; 3using System.Net;
4using Nwc.XmlRpc; 4using Nwc.XmlRpc;
5using OpenSim.Framework.Data; 5using OpenSim.Framework.Data;
6using OpenSim.Framework.UserManagement; 6using OpenSim.Framework.UserManagement;
7using OpenSim.Framework.Utilities; 7using OpenSim.Framework.Utilities;
8using OpenSim.Framework.Configuration; 8using OpenSim.Framework.Configuration;
9 9using OpenSim.Framework.Types;
10namespace OpenSim.Grid.UserServer 10
11{ 11namespace OpenSim.Grid.UserServer
12 public class UserLoginService : LoginService 12{
13 { 13 public class UserLoginService : LoginService
14 public UserConfig m_config; 14 {
15 15 public UserConfig m_config;
16 public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess) 16
17 : base(userManager, welcomeMess) 17 public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
18 { 18 : base(userManager, welcomeMess)
19 m_config = config; 19 {
20 } 20 m_config = config;
21 21 }
22 /// <summary> 22
23 /// Customises the login response and fills in missing values. 23 /// <summary>
24 /// </summary> 24 /// Customises the login response and fills in missing values.
25 /// <param name="response">The existing response</param> 25 /// </summary>
26 /// <param name="theUser">The user profile</param> 26 /// <param name="response">The existing response</param>
27 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) 27 /// <param name="theUser">The user profile</param>
28 { 28 public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
29 // Load information from the gridserver 29 {
30 SimProfileData SimInfo = new SimProfileData(); 30 // Load information from the gridserver
31 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey); 31 SimProfileData SimInfo = new SimProfileData();
32 32 SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
33 // Customise the response 33
34 // Home Location 34 // Customise the response
35 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " + 35 // Home Location
36 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + 36 response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +
37 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 37 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
38 38 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
39 // Destination 39
40 Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); 40 // Destination
41 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); 41 Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);
42 response.SimPort = (Int32)SimInfo.serverPort; 42 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
43 response.RegionX = SimInfo.regionLocX; 43 response.SimPort = (Int32)SimInfo.serverPort;
44 response.RegionY = SimInfo.regionLocY; 44 response.RegionX = SimInfo.regionLocX;
45 45 response.RegionY = SimInfo.regionLocY;
46 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI 46
47 string capsPath = Util.GetRandomCapsPath(); 47 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
48 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; 48 string capsPath = Util.GetRandomCapsPath();
49 49 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
50 // Notify the target of an incoming user 50
51 Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); 51 // Notify the target of an incoming user
52 52 Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
53 // Prepare notification 53
54 Hashtable SimParams = new Hashtable(); 54 // Prepare notification
55 SimParams["session_id"] = theUser.currentAgent.sessionID.ToString(); 55 Hashtable SimParams = new Hashtable();
56 SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString(); 56 SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();
57 SimParams["firstname"] = theUser.username; 57 SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();
58 SimParams["lastname"] = theUser.surname; 58 SimParams["firstname"] = theUser.username;
59 SimParams["agent_id"] = theUser.UUID.ToString(); 59 SimParams["lastname"] = theUser.surname;
60 SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode); 60 SimParams["agent_id"] = theUser.UUID.ToString();
61 SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString(); 61 SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);
62 SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString(); 62 SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
63 SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString(); 63 SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
64 SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString(); 64 SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
65 SimParams["caps_path"] = capsPath; 65 SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();
66 ArrayList SendParams = new ArrayList(); 66 SimParams["caps_path"] = capsPath;
67 SendParams.Add(SimParams); 67 ArrayList SendParams = new ArrayList();
68 68 SendParams.Add(SimParams);
69 // Update agent with target sim 69
70 theUser.currentAgent.currentRegion = SimInfo.UUID; 70 // Update agent with target sim
71 theUser.currentAgent.currentHandle = SimInfo.regionHandle; 71 theUser.currentAgent.currentRegion = SimInfo.UUID;
72 72 theUser.currentAgent.currentHandle = SimInfo.regionHandle;
73 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI); 73
74 System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
74 // Send 75 // Send
75 try 76 try
76 { 77 {
77 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 78 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
78 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 79 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
79 } 80 }
80 catch( WebException e ) 81 catch( WebException e )
81 { 82 {
82 switch( e.Status ) 83 switch( e.Status )
83 { 84 {
@@ -88,8 +89,8 @@ namespace OpenSim.Grid.UserServer
88 default: 89 default:
89 throw; 90 throw;
90 } 91 }
91 } 92 }
92 } 93 }
93 } 94 }
94} 95}
95 96
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 1fbd421..5db4901 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31using Nwc.XmlRpc; 31using Nwc.XmlRpc;
32using OpenSim.Framework.Data; 32using OpenSim.Framework.Types;
33using OpenSim.Framework.UserManagement; 33using OpenSim.Framework.UserManagement;
34using OpenSim.Framework.Utilities; 34using OpenSim.Framework.Utilities;
35using libsecondlife; 35using libsecondlife;
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 253807c..ed3c16c 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -35,7 +35,6 @@ using libsecondlife.Packets;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 37using OpenSim.Framework.Types;
38using OpenSim.Framework.Data;
39using OpenSim.Framework.Utilities; 38using OpenSim.Framework.Utilities;
40 39
41namespace OpenSim.Region.ClientStack 40namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 6ae8b65..62e2afd 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -31,7 +31,6 @@ using System.Net;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34using OpenSim.Framework.Data;
35using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework.Types; 36using OpenSim.Framework.Types;
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 53f6ffa..dc91663 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -1,7 +1,7 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using libsecondlife; 2using libsecondlife;
3using OpenSim.Framework.Communications; 3using OpenSim.Framework.Communications;
4using OpenSim.Framework.Data; 4using OpenSim.Framework.Types;
5using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder; 5using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
6 6
7namespace OpenSim.Region.Communications.Local 7namespace OpenSim.Region.Communications.Local
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index ab8e397..9835583 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -3,7 +3,6 @@ using System.Collections;
3using System.Collections.Generic; 3using System.Collections.Generic;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Communications; 5using OpenSim.Framework.Communications;
6using OpenSim.Framework.Data;
7using OpenSim.Framework.Types; 6using OpenSim.Framework.Types;
8using OpenSim.Framework.UserManagement; 7using OpenSim.Framework.UserManagement;
9using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 4e75eb0..ac680ca 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -1,6 +1,5 @@
1using System; 1using System;
2using OpenSim.Framework.Communications; 2using OpenSim.Framework.Communications;
3using OpenSim.Framework.Data;
4using OpenSim.Framework.Types; 3using OpenSim.Framework.Types;
5using OpenSim.Framework.UserManagement; 4using OpenSim.Framework.UserManagement;
6 5
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 45188c1..f364771 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -1,7 +1,7 @@
1using System.Collections.Generic; 1using System.Collections.Generic;
2using libsecondlife; 2using libsecondlife;
3using OpenSim.Framework.Communications; 3using OpenSim.Framework.Communications;
4using OpenSim.Framework.Data; 4using OpenSim.Framework.Types;
5using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder; 5using InventoryFolder = OpenSim.Framework.Communications.Caches.InventoryFolder;
6 6
7 7
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 90fef86..32f39b4 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -2,8 +2,8 @@ using System;
2using System.Collections; 2using System.Collections;
3using libsecondlife; 3using libsecondlife;
4using Nwc.XmlRpc; 4using Nwc.XmlRpc;
5using OpenSim.Framework.Data;
6using OpenSim.Framework.Interfaces; 5using OpenSim.Framework.Interfaces;
6using OpenSim.Framework.Types;
7 7
8namespace OpenSim.Region.Communications.OGS1 8namespace OpenSim.Region.Communications.OGS1
9{ 9{
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index bcc02ea..b7f5bad 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1,8 +1,8 @@
1using Axiom.Math; 1using Axiom.Math;
2using libsecondlife; 2using libsecondlife;
3using libsecondlife.Packets; 3using libsecondlife.Packets;
4using OpenSim.Framework.Communications.Cache;
4using OpenSim.Framework.Communications.Caches; 5using OpenSim.Framework.Communications.Caches;
5using OpenSim.Framework.Data;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
8using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index da9f366..5989879 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -6,7 +6,6 @@ using System.Xml;
6using Axiom.Math; 6using Axiom.Math;
7using libsecondlife; 7using libsecondlife;
8using libsecondlife.Packets; 8using libsecondlife.Packets;
9using OpenSim.Framework.Data;
10using OpenSim.Framework.Interfaces; 9using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Types; 10using OpenSim.Framework.Types;
12using OpenSim.Region.Environment.Interfaces; 11using OpenSim.Region.Environment.Interfaces;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 7836199..41dea8e 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -3,7 +3,6 @@ using System.Net;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using libsecondlife.Packets; 5using libsecondlife.Packets;
6using OpenSim.Framework.Data;
7using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
9using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;