diff options
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 9d151df..712b899 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -746,8 +746,10 @@ namespace OpenSim.Services.LLLoginService | |||
746 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); | 746 | m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); |
747 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) | 747 | if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) |
748 | { | 748 | { |
749 | //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, gatekeeper.ExternalEndPoint.Address); | 749 | // We may need to do this at some point, |
750 | m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString()); | 750 | // so leaving it here in comments. |
751 | //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, destination.ExternalEndPoint.Address); | ||
752 | m_UserAgentService.SetClientToken(aCircuit.SessionID, /*addr.Address.ToString() */ clientIP.Address.ToString()); | ||
751 | return true; | 753 | return true; |
752 | } | 754 | } |
753 | return false; | 755 | return false; |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 32b240b..52e30e2 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -42,7 +42,6 @@ | |||
42 | 42 | ||
43 | [AvatarService] | 43 | [AvatarService] |
44 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 44 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
45 | ConnectionString = "URI=file:avatars.db,version=3" | ||
46 | 45 | ||
47 | [LibraryService] | 46 | [LibraryService] |
48 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 47 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
@@ -54,7 +53,6 @@ | |||
54 | 53 | ||
55 | [AuthenticationService] | 54 | [AuthenticationService] |
56 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 55 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
57 | ConnectionString = "URI=file:auth.db,version=3" | ||
58 | 56 | ||
59 | [GridService] | 57 | [GridService] |
60 | ; LocalGridServicesConnector needs this | 58 | ; LocalGridServicesConnector needs this |
@@ -82,7 +80,6 @@ | |||
82 | 80 | ||
83 | [FriendsService] | 81 | [FriendsService] |
84 | LocalServiceModule = "OpenSim.Services.FriendsService.dll" | 82 | LocalServiceModule = "OpenSim.Services.FriendsService.dll" |
85 | ConnectionString = "URI=file:friends.db,version=3" | ||
86 | 83 | ||
87 | [Friends] | 84 | [Friends] |
88 | Connector = "OpenSim.Services.FriendsService.dll" | 85 | Connector = "OpenSim.Services.FriendsService.dll" |