Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

author: Melanie 2013-03-26 03:26:28 +0000
committer: Melanie 2013-03-26 03:26:28 +0000
commit: 36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch)
tree: db7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
parent: Merge branch 'master' into careminster (diff)
parent: Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff)
download: opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip
opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz
opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2
opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
index 5ec0ea9..b44a5c9 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
@@ -36,6 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using Mono.Addins;
+using PermissionMask = OpenSim.Framework.PermissionMask;
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
author	Melanie	2013-03-26 03:26:28 +0000
committer	Melanie	2013-03-26 03:26:28 +0000
commit	36c57bac8e86b5c64c5ef89a0dc24e55662ad34c (patch)
tree	db7079f27f7209f5eacdd27e9a25903d56030032 /OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff)
download	opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.zip opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.gz opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.bz2 opensim-SC-36c57bac8e86b5c64c5ef89a0dc24e55662ad34c.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs index 5ec0ea9..b44a5c9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
@@ -36,6 +36,7 @@ using OpenSim.Region.Framework.Interfaces;
36	using OpenSim.Region.Framework.Scenes;	36	using OpenSim.Region.Framework.Scenes;
37	using OpenSim.Services.Interfaces;	37	using OpenSim.Services.Interfaces;
38	using Mono.Addins;	38	using Mono.Addins;
		39	using PermissionMask = OpenSim.Framework.PermissionMask;
39		40
40	namespace OpenSim.Region.CoreModules.Avatar.Friends	41	namespace OpenSim.Region.CoreModules.Avatar.Friends
41	{	42	{