diff options
| author | Melanie | 2011-10-26 17:55:53 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:55:53 +0200 |
| commit | c763419043773c93dbbc865ec35f7ecf856a641a (patch) | |
| tree | ac9f99c33ae788e6b7fdfd0843c2ae584a896dc6 /OpenSim/Region/CoreModules/Avatar/Friends | |
| parent | Fix a missing locking call (diff) | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| download | opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.zip opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.gz opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.bz2 opensim-SC-c763419043773c93dbbc865ec35f7ecf856a641a.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 4350cde..a5131ec 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -36,6 +36,7 @@ using OpenMetaverse; | |||
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
| 38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
| 39 | using OpenSim.Framework.Servers; | ||
| 39 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
| 40 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
| 41 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |