diff options
| author | Justin Clark-Casey (justincc) | 2012-01-10 18:42:37 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-10 18:42:37 +0000 |
| commit | d67e9916b8c42ac0b0a66429e542c854f1931e1e (patch) | |
| tree | 06292105285565fff5ad2c01c7c4b5d6ee30ce46 /OpenSim/Region | |
| parent | Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a... (diff) | |
| parent | HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ... (diff) | |
| download | opensim-SC-d67e9916b8c42ac0b0a66429e542c854f1931e1e.zip opensim-SC-d67e9916b8c42ac0b0a66429e542c854f1931e1e.tar.gz opensim-SC-d67e9916b8c42ac0b0a66429e542c854f1931e1e.tar.bz2 opensim-SC-d67e9916b8c42ac0b0a66429e542c854f1931e1e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index a77646c..9c53fc4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
| @@ -496,13 +496,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 496 | string agentFriendService = string.Empty; | 496 | string agentFriendService = string.Empty; |
| 497 | string friendFriendService = string.Empty; | 497 | string friendFriendService = string.Empty; |
| 498 | 498 | ||
| 499 | if (agentIsLocal) | 499 | if (agentClient != null) |
| 500 | { | 500 | { |
| 501 | agentClientCircuit = ((Scene)(agentClient.Scene)).AuthenticateHandler.GetAgentCircuitData(agentClient.CircuitCode); | 501 | agentClientCircuit = ((Scene)(agentClient.Scene)).AuthenticateHandler.GetAgentCircuitData(agentClient.CircuitCode); |
| 502 | agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); | 502 | agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); |
| 503 | agentFriendService = agentClientCircuit.ServiceURLs["FriendsServerURI"].ToString(); | 503 | agentFriendService = agentClientCircuit.ServiceURLs["FriendsServerURI"].ToString(); |
| 504 | } | 504 | } |
| 505 | if (friendIsLocal) | 505 | if (friendClient != null) |
| 506 | { | 506 | { |
| 507 | friendClientCircuit = ((Scene)(friendClient.Scene)).AuthenticateHandler.GetAgentCircuitData(friendClient.CircuitCode); | 507 | friendClientCircuit = ((Scene)(friendClient.Scene)).AuthenticateHandler.GetAgentCircuitData(friendClient.CircuitCode); |
| 508 | friendUUI = Util.ProduceUserUniversalIdentifier(friendClientCircuit); | 508 | friendUUI = Util.ProduceUserUniversalIdentifier(friendClientCircuit); |