aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-16 01:45:09 +0000
committerJustin Clark-Casey (justincc)2013-01-16 01:45:09 +0000
commitb8949024bc55c62b9268b35d4f2a568760b9d7d3 (patch)
tree7b8d984c957fab7aba5aceec66967adb5e8a0d51 /prebuild.xml
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.zip
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.gz
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.bz2
opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.xz
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
Diffstat (limited to '')
-rw-r--r--prebuild.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/prebuild.xml b/prebuild.xml
index abf8f36..c6bef5c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2417,9 +2417,7 @@
2417 <Reference name="log4net" path="../../../../../bin/"/> 2417 <Reference name="log4net" path="../../../../../bin/"/>
2418 2418
2419 <Files> 2419 <Files>
2420 <Match pattern="*.cs" recurse="true"> 2420 <Match pattern="*.cs" recurse="true"/>
2421 <Exclude name="Tests" pattern="Tests"/>
2422 </Match>
2423 </Files> 2421 </Files>
2424 </Project> 2422 </Project>
2425 2423
@@ -3311,7 +3309,6 @@
3311 <!-- SADLY the way this works means you need to keep adding these paths --> 3309 <!-- SADLY the way this works means you need to keep adding these paths -->
3312 <Match path="Shared/Tests" pattern="*.cs" recurse="true"/> 3310 <Match path="Shared/Tests" pattern="*.cs" recurse="true"/>
3313 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/> 3311 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/>
3314 <Match path="Shared/Instance/Tests" pattern="*.cs" recurse="true"/>
3315 <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/> 3312 <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/>
3316 </Files> 3313 </Files>
3317 </Project> 3314 </Project>