aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2011-04-26 23:20:13 +0200
committerMelanie2011-04-26 23:20:13 +0200
commit4ed54dcc013b2901cb74b81c1300972a9591c612 (patch)
tree7f58e5d7dbd71eb66a798e68fbed030ae8e38217 /prebuild.xml
parentTry to repair attachments ion the fly if they are detached and reattached. (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-4ed54dcc013b2901cb74b81c1300972a9591c612.zip
opensim-SC_OLD-4ed54dcc013b2901cb74b81c1300972a9591c612.tar.gz
opensim-SC_OLD-4ed54dcc013b2901cb74b81c1300972a9591c612.tar.bz2
opensim-SC_OLD-4ed54dcc013b2901cb74b81c1300972a9591c612.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml10
1 files changed, 0 insertions, 10 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 16b5bfa..e87036c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2194,7 +2194,6 @@
2194 <Reference name="OpenSim.Framework.Console"/> 2194 <Reference name="OpenSim.Framework.Console"/>
2195 <Reference name="OpenSim.Services.Interfaces"/> 2195 <Reference name="OpenSim.Services.Interfaces"/>
2196 <Reference name="Nini" path="../../../../bin/"/> 2196 <Reference name="Nini" path="../../../../bin/"/>
2197 <Reference name="RAIL" path="../../../../bin/"/>
2198 <Reference name="Nini" path="../../../../bin/"/> 2197 <Reference name="Nini" path="../../../../bin/"/>
2199 <Reference name="log4net" path="../../../../bin/"/> 2198 <Reference name="log4net" path="../../../../bin/"/>
2200 <Reference name="SmartThreadPool"/> 2199 <Reference name="SmartThreadPool"/>
@@ -2232,8 +2231,6 @@
2232 <Reference name="OpenSim.Framework.Console"/> 2231 <Reference name="OpenSim.Framework.Console"/>
2233 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2232 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2234 <Reference name="Nini" path="../../../../../../bin/"/> 2233 <Reference name="Nini" path="../../../../../../bin/"/>
2235 <Reference name="RAIL" path="../../../../../../bin/"/>
2236 <Reference name="Nini" path="../../../../../../bin/"/>
2237 <Reference name="log4net" path="../../../../../../bin/"/> 2234 <Reference name="log4net" path="../../../../../../bin/"/>
2238 2235
2239 <Files> 2236 <Files>
@@ -2266,8 +2263,6 @@
2266 <Reference name="OpenSim.Framework.Console"/> 2263 <Reference name="OpenSim.Framework.Console"/>
2267 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2264 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2268 <Reference name="Nini" path="../../../../../../../bin/"/> 2265 <Reference name="Nini" path="../../../../../../../bin/"/>
2269 <Reference name="RAIL" path="../../../../../../../bin/"/>
2270 <Reference name="Nini" path="../../../../../../../bin/"/>
2271 <Reference name="log4net" path="../../../../../../../bin/"/> 2266 <Reference name="log4net" path="../../../../../../../bin/"/>
2272 2267
2273 <Files> 2268 <Files>
@@ -2306,8 +2301,6 @@
2306 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 2301 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
2307 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> 2302 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/>
2308 <Reference name="Nini" path="../../../../../../bin/"/> 2303 <Reference name="Nini" path="../../../../../../bin/"/>
2309 <Reference name="RAIL" path="../../../../../../bin/"/>
2310 <Reference name="Nini" path="../../../../../../bin/"/>
2311 <Reference name="log4net" path="../../../../../../bin/"/> 2304 <Reference name="log4net" path="../../../../../../bin/"/>
2312 2305
2313 <Files> 2306 <Files>
@@ -2336,7 +2329,6 @@
2336 <Reference name="OpenSim.Region.CoreModules"/> 2329 <Reference name="OpenSim.Region.CoreModules"/>
2337 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> 2330 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
2338 <Reference name="Nini" path="../../../../../bin/"/> 2331 <Reference name="Nini" path="../../../../../bin/"/>
2339 <Reference name="RAIL" path="../../../../../bin/"/>
2340 <Reference name="log4net" path="../../../../../bin/"/> 2332 <Reference name="log4net" path="../../../../../bin/"/>
2341 <Reference name="Tools" path="../../../../../bin/"/> 2333 <Reference name="Tools" path="../../../../../bin/"/>
2342 2334
@@ -2378,7 +2370,6 @@
2378 <Reference name="SmartThreadPool"/> 2370 <Reference name="SmartThreadPool"/>
2379 <Reference name="Axiom.MathLib" path="../../../../../bin/"/> 2371 <Reference name="Axiom.MathLib" path="../../../../../bin/"/>
2380 <Reference name="Nini" path="../../../../../bin/"/> 2372 <Reference name="Nini" path="../../../../../bin/"/>
2381 <Reference name="RAIL" path="../../../../../bin/"/>
2382 <Reference name="log4net" path="../../../../../bin/"/> 2373 <Reference name="log4net" path="../../../../../bin/"/>
2383 2374
2384 <Files> 2375 <Files>
@@ -2417,7 +2408,6 @@
2417 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> 2408 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/>
2418 <Reference name="SmartThreadPool"/> 2409 <Reference name="SmartThreadPool"/>
2419 <Reference name="Nini" path="../../../../bin/"/> 2410 <Reference name="Nini" path="../../../../bin/"/>
2420 <Reference name="RAIL" path="../../../../bin/"/>
2421 <Reference name="log4net" path="../../../../bin/"/> 2411 <Reference name="log4net" path="../../../../bin/"/>
2422 2412
2423 <Files> 2413 <Files>