diff options
author | Melanie | 2012-03-29 01:13:08 +0100 |
---|---|---|
committer | Melanie | 2012-03-29 01:13:08 +0100 |
commit | bd83676d6c01b59c5d2b55f81e5f3ce9885f450e (patch) | |
tree | d541a3973f9e243d4bd945ee64641f4b566ac161 | |
parent | Revert "Simplify friends caching by only doing this for root agents - no func... (diff) | |
download | opensim-SC-bd83676d6c01b59c5d2b55f81e5f3ce9885f450e.zip opensim-SC-bd83676d6c01b59c5d2b55f81e5f3ce9885f450e.tar.gz opensim-SC-bd83676d6c01b59c5d2b55f81e5f3ce9885f450e.tar.bz2 opensim-SC-bd83676d6c01b59c5d2b55f81e5f3ce9885f450e.tar.xz |
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | 31 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICallingCardModule.cs (renamed from OpenSim/Framework/ICallingCardModule.cs) | 0 |
2 files changed, 29 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs index 5e2a651..d942e87 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Reflection; | 30 | using System.Reflection; |
4 | using log4net; | 31 | using log4net; |
@@ -10,7 +37,7 @@ using OpenSim.Region.Framework.Scenes; | |||
10 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
11 | using Mono.Addins; | 38 | using Mono.Addins; |
12 | 39 | ||
13 | namespace Careminster.XCallingCard.Modules | 40 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
14 | { | 41 | { |
15 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XCallingCard")] | 42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XCallingCard")] |
16 | public class CallingCardModule : ISharedRegionModule, ICallingCardModule | 43 | public class CallingCardModule : ISharedRegionModule, ICallingCardModule |
diff --git a/OpenSim/Framework/ICallingCardModule.cs b/OpenSim/Region/Framework/Interfaces/ICallingCardModule.cs index 17e6de35..17e6de35 100644 --- a/OpenSim/Framework/ICallingCardModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICallingCardModule.cs | |||