diff options
| author | Mic Bowman | 2011-04-13 15:41:17 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-13 15:41:17 -0700 |
| commit | 590d20903c6dd596cb8ae3337065f955bd207b67 (patch) | |
| tree | f6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
| parent | Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff) | |
| parent | remove packet monitoring debugging code (diff) | |
| download | opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz | |
Merge branch 'testmerge' into queuetest
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 4d74b2a..5baf078 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -34,13 +34,13 @@ using Nini.Config; | |||
| 34 | using Nwc.XmlRpc; | 34 | using Nwc.XmlRpc; |
| 35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using OpenSim.Framework.Servers.HttpServer; | ||
| 37 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
| 38 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
| 39 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
| 40 | using OpenSim.Services.Interfaces; | 41 | using OpenSim.Services.Interfaces; |
| 41 | using OpenSim.Services.Connectors.Friends; | 42 | using OpenSim.Services.Connectors.Friends; |
| 42 | using OpenSim.Server.Base; | 43 | using OpenSim.Server.Base; |
| 43 | using OpenSim.Framework.Servers.HttpServer; | ||
| 44 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; | 44 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; |
| 45 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; | 45 | using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; |
| 46 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 46 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |