diff options
author | Diva Canto | 2010-04-26 14:52:22 -0700 |
---|---|---|
committer | Diva Canto | 2010-04-26 14:52:22 -0700 |
commit | 2ac00b7f96b01cf9494d2a5fef9a84443301a04c (patch) | |
tree | 418a3b9d08a2d6888044d92bdbccaecf58b60b08 | |
parent | Add instructions for using SQLiteNG to OpenSim.ini and config-include/Standal... (diff) | |
download | opensim-SC-2ac00b7f96b01cf9494d2a5fef9a84443301a04c.zip opensim-SC-2ac00b7f96b01cf9494d2a5fef9a84443301a04c.tar.gz opensim-SC-2ac00b7f96b01cf9494d2a5fef9a84443301a04c.tar.bz2 opensim-SC-2ac00b7f96b01cf9494d2a5fef9a84443301a04c.tar.xz |
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
* IRegionModule.cs wants to be committed too -- EOF.
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionModule.cs | 4 | ||||
-rw-r--r-- | prebuild.xml | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs index 8365fe3..e25a6e8 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs | |||
@@ -30,8 +30,8 @@ using OpenSim.Region.Framework.Scenes; | |||
30 | 30 | ||
31 | namespace OpenSim.Region.Framework.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead | 34 | /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead |
35 | /// </summary> | 35 | /// </summary> |
36 | public interface IRegionModule | 36 | public interface IRegionModule |
37 | { | 37 | { |
diff --git a/prebuild.xml b/prebuild.xml index 602750a..dd163f0 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2215,6 +2215,7 @@ | |||
2215 | </Files> | 2215 | </Files> |
2216 | </Project> | 2216 | </Project> |
2217 | 2217 | ||
2218 | <!-- | ||
2218 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library"> | 2219 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library"> |
2219 | <Configuration name="Debug"> | 2220 | <Configuration name="Debug"> |
2220 | <Options> | 2221 | <Options> |
@@ -2250,7 +2251,8 @@ | |||
2250 | <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> | 2251 | <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> |
2251 | </Files> | 2252 | </Files> |
2252 | </Project> | 2253 | </Project> |
2253 | 2254 | --> | |
2255 | |||
2254 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> | 2256 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> |
2255 | <Configuration name="Debug"> | 2257 | <Configuration name="Debug"> |
2256 | <Options> | 2258 | <Options> |