diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Servers/LoginServer.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim.Servers/LoginServer.cs b/OpenSim.Servers/LoginServer.cs index c56dbc1..795ce15 100644 --- a/OpenSim.Servers/LoginServer.cs +++ b/OpenSim.Servers/LoginServer.cs | |||
@@ -62,6 +62,8 @@ namespace OpenSim.UserServer | |||
62 | private LocalUserProfileManager userManager; | 62 | private LocalUserProfileManager userManager; |
63 | private int m_simPort; | 63 | private int m_simPort; |
64 | private string m_simAddr; | 64 | private string m_simAddr; |
65 | private uint regionX; | ||
66 | private uint regionY; | ||
65 | 67 | ||
66 | public LocalUserProfileManager LocalUserManager | 68 | public LocalUserProfileManager LocalUserManager |
67 | { | 69 | { |
@@ -71,11 +73,13 @@ namespace OpenSim.UserServer | |||
71 | } | 73 | } |
72 | } | 74 | } |
73 | 75 | ||
74 | public LoginServer(IGridServer gridServer, string simAddr, int simPort, bool useAccounts) | 76 | public LoginServer(IGridServer gridServer, string simAddr, int simPort, uint regX, uint regY, bool useAccounts) |
75 | { | 77 | { |
76 | m_gridServer = gridServer; | 78 | m_gridServer = gridServer; |
77 | m_simPort = simPort; | 79 | m_simPort = simPort; |
78 | m_simAddr = simAddr; | 80 | m_simAddr = simAddr; |
81 | regionX = regX; | ||
82 | regionY = regY; | ||
79 | this.userAccounts = useAccounts; | 83 | this.userAccounts = useAccounts; |
80 | } | 84 | } |
81 | 85 | ||
@@ -97,7 +101,7 @@ namespace OpenSim.UserServer | |||
97 | 101 | ||
98 | this._mpasswd = EncodePassword("testpass"); | 102 | this._mpasswd = EncodePassword("testpass"); |
99 | 103 | ||
100 | userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr); | 104 | userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY); |
101 | //userManager.InitUserProfiles(); | 105 | //userManager.InitUserProfiles(); |
102 | userManager.SetKeys("", "", "", "Welcome to OpenSim"); | 106 | userManager.SetKeys("", "", "", "Welcome to OpenSim"); |
103 | } | 107 | } |
@@ -112,7 +116,7 @@ namespace OpenSim.UserServer | |||
112 | LLUUID Agent; | 116 | LLUUID Agent; |
113 | LLUUID Session; | 117 | LLUUID Session; |
114 | 118 | ||
115 | LoginResponse loginResponse = new LoginResponse(); | 119 | LoginResponse loginResponse = new LoginResponse(regionX, regionY); |
116 | 120 | ||
117 | //get login name | 121 | //get login name |
118 | if (requestData.Contains("first")) | 122 | if (requestData.Contains("first")) |