aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorDan Lake2012-03-27 12:51:58 -0700
committerDan Lake2012-03-27 12:51:58 -0700
commit971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree2607c27fad429ff0036fe7b7d275ddf717397282 /prebuild.xml
parentWhen loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parentHG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
downloadopensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.zip
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 79814ac..f8d03f3 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -164,6 +164,7 @@
164 164
165 <ReferencePath>../../../bin/</ReferencePath> 165 <ReferencePath>../../../bin/</ReferencePath>
166 <Reference name="System"/> 166 <Reference name="System"/>
167 <Reference name="System.Core"/>
167 <Reference name="System.Xml"/> 168 <Reference name="System.Xml"/>
168 <Reference name="System.Web"/> 169 <Reference name="System.Web"/>
169 <Reference name="log4net" path="../../../bin/"/> 170 <Reference name="log4net" path="../../../bin/"/>
@@ -2051,9 +2052,10 @@
2051 2052
2052 <ReferencePath>../../../bin/</ReferencePath> 2053 <ReferencePath>../../../bin/</ReferencePath>
2053 <Reference name="System"/> 2054 <Reference name="System"/>
2054 <Reference name="System.Xml"/> 2055 <Reference name="System.Core"/>
2055 <Reference name="System.Data"/> 2056 <Reference name="System.Data"/>
2056 <Reference name="System.Drawing"/> 2057 <Reference name="System.Drawing"/>
2058 <Reference name="System.Xml"/>
2057 <Reference name="OpenSim.Framework"/> 2059 <Reference name="OpenSim.Framework"/>
2058 <Reference name="OpenSim.Data"/> 2060 <Reference name="OpenSim.Data"/>
2059 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2061 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>