Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-03-10 07:14:03 +0000
committer: Melanie 2011-03-10 07:14:03 +0000
commit: 9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree: 839af9da6d5d56613312ad7b4fa2b1f9493a4842 /prebuild.xml
parent: Change protection from being teleported home to extend to incognito gods. (diff)
parent: Change existing users load iar test so that it fulfills it's original intenti... (diff)
download: opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip
opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz
opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2
opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index bf6c1cc..fc94e75 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2959,6 +2959,7 @@
        <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>
        <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
        <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>
+        <Match path="World/Media/Moap/Tests" pattern="*.cs" recurse="true"/>
        <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/>
        <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/>
        <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true"/>
author	Melanie	2011-03-10 07:14:03 +0000
committer	Melanie	2011-03-10 07:14:03 +0000
commit	9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree	839af9da6d5d56613312ad7b4fa2b1f9493a4842 /prebuild.xml
parent	Change protection from being teleported home to extend to incognito gods. (diff)
parent	Change existing users load iar test so that it fulfills it's original intenti... (diff)
download	opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2 opensim-SC_OLD-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index bf6c1cc..fc94e75 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -2959,6 +2959,7 @@
2959	<Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>	2959	<Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>
2960	<Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>	2960	<Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
2961	<Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>	2961	<Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>
		2962	<Match path="World/Media/Moap/Tests" pattern="*.cs" recurse="true"/>
2962	<Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/>	2963	<Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/>
2963	<Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/>	2964	<Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/>
2964	<Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true"/>	2965	<Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true"/>