diff options
| author | Sean McNamara | 2011-04-23 18:33:08 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-23 18:33:08 -0400 |
| commit | d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9 (patch) | |
| tree | 30a24bf66050c66ebe74b68745c4f1764fe09181 /OpenSim/Services/Connectors/Friends | |
| parent | AutoBackup: Removed unneeded imports. (diff) | |
| parent | Added MaxAgents configuration option to RegionConfig.ini allowing region host... (diff) | |
| download | opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.zip opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.gz opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.bz2 opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.xz | |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/Friends')
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | 2 |
2 files changed, 1 insertions, 2 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; |
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs index 0a7b277..4ffa68c 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | |||
| @@ -32,7 +32,7 @@ using System.Reflection; | |||
| 32 | using OpenSim.Services.Interfaces; | 32 | using OpenSim.Services.Interfaces; |
| 33 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 33 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
| 34 | using OpenSim.Server.Base; | 34 | using OpenSim.Server.Base; |
| 35 | using OpenSim.Framework.Servers.HttpServer; | 35 | using OpenSim.Framework; |
| 36 | 36 | ||
| 37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
| 38 | using log4net; | 38 | using log4net; |