Dan Lake 32ddcefaca Merge branch 'master' into dev ... Conflicts: OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs		2011-06-14 23:15:34 -07:00
..
Library	…
Regions	…
ScriptEngines	…
addon-modules	…
assets	…
config-include	Merge branch 'master' into dev	2011-06-14 23:15:34 -07:00
data	…
inventory	…
Axiom.MathLib.dll	…
BulletDotNET.dll	…
BulletDotNET.pdb	…
BulletSim.dll	…
C5.dll	…
CSJ2K.dll	…
Community.CsharpSqlite.Sqlite.dll	…
Community.CsharpSqlite.Sqlite.pdb	…
Community.CsharpSqlite.dll	…
Community.CsharpSqlite.pdb	…
CookComputing.XmlRpcV2.dll	…
DotNetOpenId.dll	…
DotNetOpenMail.dll	…
Fadd.Globalization.Yaml.dll	…
Fadd.dll	…
GlynnTucker.Cache.dll	…
Google.ProtocolBuffers.dll	…
HttpServer.dll	…
HttpServer_OpenSim.dll	…
HttpServer_OpenSim.pdb	…
HttpServer_OpenSim.xml	…
Iesi.Collections.dll	…
Kds.Serialization.dll	…
LaunchSLClient.ini	…
MXP.pdb	…
Modified.XnaDevRu.BulletX.dll	…
Mono.Addins.CecilReflector.dll	…
Mono.Addins.Setup.dll	…
Mono.Addins.dll	…
Mono.Addins.dll.config	…
Mono.Data.Sqlite.dll	…
Mono.Data.Sqlite.dll.config	…
Mono.Data.SqliteClient.dll	…
MonoXnaCompactMaths.dll	…
MySql.Data.dll	…
NDesk.Options.dll	…
Newtonsoft.Json.Net20.dll	…
Newtonsoft.Json.XML	…
Newtonsoft.Json.pdb	…
Nini.dll	…
Npgsql.dll	…
Ode.NET.dll	…
Ode.NET.dll.config	…
OpenMetaverse.Http.XML	…
OpenMetaverse.Rendering.Meshmerizer.dll	…
OpenMetaverse.StructuredData.XML	…
OpenMetaverse.StructuredData.dll	…
OpenMetaverse.XML	…
OpenMetaverse.dll	…
OpenMetaverse.dll.config	…
OpenMetaverseTypes.XML	…
OpenMetaverseTypes.dll	…
OpenSim.32BitLaunch.exe	…
OpenSim.32BitLaunch.exe.config	…
OpenSim.ConsoleClient.exe.config	…
OpenSim.ConsoleClient.ini.example	…
OpenSim.Framework.Communications.Tests.dll.config	…
OpenSim.Framework.Servers.Tests.dll.config	…
OpenSim.Framework.Tests.dll.config	…
OpenSim.Region.CoreModules.Tests.dll.config	…
OpenSim.Region.Framework.Tests.dll.config	…
OpenSim.Region.ScriptEngine.Tests.dll.config	…
OpenSim.Services.exe.config	…
OpenSim.addin.xml	…
OpenSim.exe.config	…
OpenSim.ini.example	…
OpenSimDefaults.ini	…
OpenSimExport.exe.config	…
PhysX-wrapper.dll	…
PhysX_Wrapper_Dotnet.dll	…
Prebuild.exe	…
PrimMesher.dll	…
PumaCode.SvnDotNet.dll	…
RegionConfig.ini.example	…
Robust.32BitLaunch.exe	…
Robust.32BitLaunch.exe.config	…
Robust.HG.ini.example	…
Robust.exe.config	…
Robust.ini.example	…
SimpleApp.exe.config	…
Tools.dll	…
Warp3D.dll	…
XMLRPC.dll	…
avatar-texture.dat	…
defaultstripe.png	…
excuses	…
http_404.html.example	…
http_500.html.example	…
http_loginform.html.example	…
libbulletnet.dll	…
libbulletnet.so	…
libdb_dotNET43.dll	…
libode-x86_64.so	…
libode.dylib	…
libode.so	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib	…
libopenjpeg-dotnet-2.1.3.0-dotnet-1.so	* Progressive texture patch + PriorityQueue put into the LLClient namespace.	2009-01-19 17:11:57 +00:00
libsqlite3.dylib	…
libsqlite3.txt	…
libsqlite3_32.so	…
libsqlite3_64.so	…
log4net.dll	…
nunit.framework.dll	…
ode.32bit.dll	…
ode.dll	…
openjpeg-dotnet-x86_64.dll	…
openjpeg-dotnet.dll	…
opensim-ode.sh	…
pCampBot.exe.config	…
pCampBotSentences.txt	…
protobuf-net.pdb	…
shutdown_commands.txt	…
sqlite3.dll	…
startup_commands.txt.example	…
startuplogo.txt	…
xunit.dll	…
zlib.net.dll	…