Merge branch 'master' into newmultiattach

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
author: Melanie 2013-03-18 23:31:27 +0000
committer: Melanie 2013-03-18 23:31:27 +0000
commit: 5e1f651e21ba81d8be9693d7e8a47d49daa9fce5 (patch)
tree: 4856d3aa25fcd942a26af39e1510f58fef3c934d /OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
parent: Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach (diff)
parent: Improve rejection of any attempt to reattach an object that is already attached. (diff)
download: opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.zip
opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.gz
opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.bz2
opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.xz
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml b/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
deleted file mode 100644
index 94eca48..0000000
--- a/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Addin id="OpenSim.ApplicationPlugins.Rest.Regions" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
-    </Runtime>
-    <Dependencies>
-        <Addin id="OpenSim" version="0.5" />
-    </Dependencies>
-    <Extension path = "/OpenSim/Startup">
-        <Plugin id="RestRegions" type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
-    </Extension>
-</Addin>
author	Melanie	2013-03-18 23:31:27 +0000
committer	Melanie	2013-03-18 23:31:27 +0000
commit	5e1f651e21ba81d8be9693d7e8a47d49daa9fce5 (patch)
tree	4856d3aa25fcd942a26af39e1510f58fef3c934d /OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
parent	Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach (diff)
parent	Improve rejection of any attempt to reattach an object that is already attached. (diff)
download	opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.zip opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.gz opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.bz2 opensim-SC-5e1f651e21ba81d8be9693d7e8a47d49daa9fce5.tar.xz

diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml b/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml deleted file mode 100644 index 94eca48..0000000 --- a/OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml +++ /dev/null
@@ -1,11 +0,0 @@
1	<Addin id="OpenSim.ApplicationPlugins.Rest.Regions" version="0.1">
2	<Runtime>
3	<Import assembly="OpenSim.ApplicationPlugins.Rest.Regions.dll"/>
4	</Runtime>
5	<Dependencies>
6	<Addin id="OpenSim" version="0.5" />
7	</Dependencies>
8	<Extension path = "/OpenSim/Startup">
9	<Plugin id="RestRegions" type="OpenSim.ApplicationPlugins.Rest.Regions.RestRegionPlugin" />
10	</Extension>
11	</Addin>