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/Services/Connectors/Friends/FriendsServiceConnector.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-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz | |
Merge branch 'testmerge' into queuetest
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs index 36b5083..861c475 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | |||
| @@ -33,7 +33,6 @@ using System.Reflection; | |||
| 33 | using Nini.Config; | 33 | using Nini.Config; |
| 34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
| 35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
| 36 | using OpenSim.Framework.Servers.HttpServer; | ||
| 37 | using OpenSim.Services.Interfaces; | 36 | using OpenSim.Services.Interfaces; |
| 38 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; | 37 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; |
| 39 | using OpenSim.Server.Base; | 38 | using OpenSim.Server.Base; |