diff options
author | Melanie | 2012-03-31 02:18:02 +0100 |
---|---|---|
committer | Melanie | 2012-03-31 02:18:02 +0100 |
commit | f3132c45d98af7bb38251ad95013c433b5eda9e5 (patch) | |
tree | efc3d6c0529678c0a56f5a505a52944012ea607a /OpenSim/Framework/ICallingCardModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the... (diff) | |
download | opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.zip opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.gz opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.bz2 opensim-SC_OLD-f3132c45d98af7bb38251ad95013c433b5eda9e5.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'OpenSim/Framework/ICallingCardModule.cs')
-rw-r--r-- | OpenSim/Framework/ICallingCardModule.cs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/OpenSim/Framework/ICallingCardModule.cs b/OpenSim/Framework/ICallingCardModule.cs deleted file mode 100644 index 17e6de35..0000000 --- a/OpenSim/Framework/ICallingCardModule.cs +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenMetaverse; | ||
5 | using OpenSim.Framework; | ||
6 | |||
7 | namespace OpenSim.Framework | ||
8 | { | ||
9 | public interface ICallingCardModule | ||
10 | { | ||
11 | UUID CreateCallingCard(UUID userID, UUID creatorID, UUID folderID); | ||
12 | } | ||
13 | } | ||