diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid/HGUserServices.cs')
| -rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index f1a56ef..49a2261 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |||
| @@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
| 87 | return m_localUserServices.AddUserAgent(agentdata); | 87 | return m_localUserServices.AddUserAgent(agentdata); |
| 88 | 88 | ||
| 89 | return base.AddUserAgent(agentdata); | 89 | return base.AddUserAgent(agentdata); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | public override UserAgentData GetAgentByUUID(UUID userId) | 92 | public override UserAgentData GetAgentByUUID(UUID userId) |
| 93 | { | 93 | { |