Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2013-03-17 23:07:12 +0000
committer: Melanie 2013-03-17 23:07:12 +0000
commit: 46a81b3527f300336d8cf4d8e26537bac89d037e (patch)
tree: 6bb4fd61eb2f734ebc46afbb547555296e9a22d7 /OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
parent: Make the LSL memory functions virtual so script engines can override them if ... (diff)
parent: BulletSim: add INI parameter for angular banking timescale fudge parameter. (diff)
download: opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.zip
opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.tar.gz
opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.tar.bz2
opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.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-17 23:07:12 +0000
committer	Melanie	2013-03-17 23:07:12 +0000
commit	46a81b3527f300336d8cf4d8e26537bac89d037e (patch)
tree	6bb4fd61eb2f734ebc46afbb547555296e9a22d7 /OpenSim/ApplicationPlugins/Rest/Regions/Resources/RestRegionPlugin.addin.xml
parent	Make the LSL memory functions virtual so script engines can override them if ... (diff)
parent	BulletSim: add INI parameter for angular banking timescale fudge parameter. (diff)
download	opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.zip opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.tar.gz opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.tar.bz2 opensim-SC_OLD-46a81b3527f300336d8cf4d8e26537bac89d037e.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>