Tom 66dec3b874 Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

..

assets

Merge branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +00:00

config-include

minor: Add explanative text for the new currency parameter. Convert some tabs to spaces

2011-08-22 00:58:11 +01:00

data

…

inventory

Remove manually permissions settings on all current library items so that they use the defaults instead.

2011-07-23 02:13:11 +01:00

Library

…

Physics

Fixed BulletSim config files for Linux *.so libraries.

2011-09-04 21:42:33 +02:00

Regions

…

ScriptEngines

…

avatar-texture.dat

…

Axiom.MathLib.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

BulletDotNET.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

BulletDotNET.pdb

…

BulletSim-x86_64.dll

BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.

2011-08-30 13:19:53 -07:00

BulletSim.dll

BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.

2011-08-30 13:19:53 -07:00

C5.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Community.CsharpSqlite.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Community.CsharpSqlite.pdb

* Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode.

2010-09-23 00:50:18 -04:00

Community.CsharpSqlite.Sqlite.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Community.CsharpSqlite.Sqlite.pdb

* Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode.

2010-09-23 00:50:18 -04:00

CookComputing.XmlRpcV2.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

CSJ2K.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

defaultstripe.png

…

DotNetOpenId.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

DotNetOpenMail.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

excuses

…

Fadd.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Fadd.Globalization.Yaml.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

GlynnTucker.Cache.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Google.ProtocolBuffers.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

http_404.html.example

…

http_500.html.example

…

http_loginform.html.example

…

HttpServer_OpenSim.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

HttpServer_OpenSim.pdb

Catch HttpServer exception: mantis #5381

2011-02-15 08:38:37 -08:00

HttpServer_OpenSim.xml

Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last one was 4.0, and that doesn't work). Also added the corresponding .xml and .pdb, if that makes any difference.

2010-12-18 18:23:51 -08:00

Iesi.Collections.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Kds.Serialization.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

LaunchSLClient.ini

…

libbulletnet.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

libbulletnet.so

…

libBulletSim-x86_64.so

BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.

2011-08-30 13:19:53 -07:00

libBulletSim.so

BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.

2011-08-26 15:51:21 -07:00

libdb_dotNET43.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

libode-x86_64.so

update libode for 64 bit linux to r1755 (post 0.11.1) from ode 0.10.1

2010-12-10 03:51:33 +00:00

libode.dylib

Update ODE for mac from source code in opensim-libs SVN library. This version is r1755 + patches as detailed in the svn logs.

2011-04-08 20:50:23 +01:00

libode.so

Update libode.so to r1755.

2010-12-09 03:10:48 +00:00

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

…

libsqlite3_32.so

More SQLite work.

2011-03-22 16:42:12 -04:00

libsqlite3_64.so

More SQLite work.

2011-03-22 16:42:12 -04:00

libsqlite3.dylib

Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and use this instead of the system one.

2011-04-07 21:44:54 +01:00

libsqlite3.txt

Upgrade SQLite:

2011-03-18 12:12:08 -04:00

log4net.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Modified.XnaDevRu.BulletX.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Mono.Addins.CecilReflector.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Mono.Addins.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Mono.Addins.dll.config

…

Mono.Addins.Setup.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Mono.Data.Sqlite.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Mono.Data.Sqlite.dll.config

Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and use this instead of the system one.

2011-04-07 21:44:54 +01:00

Mono.Data.SqliteClient.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

MonoXnaCompactMaths.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

MsgPack.dll

Add a message packing library to binary-pack AgentCircuitData for faster

2011-05-17 22:38:45 +02:00

MySql.Data.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

NDesk.Options.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Newtonsoft.Json.Net20.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Newtonsoft.Json.pdb

…

Newtonsoft.Json.XML

…

Nini.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Npgsql.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

nunit.framework.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

ode.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Ode.NET.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Ode.NET.dll.config

…

openjpeg-dotnet-x86_64.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

openjpeg-dotnet.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

OpenMetaverse.dll

update libomv libraries to 0.9.0

2011-05-31 18:47:13 +01:00

OpenMetaverse.dll.config

* Normalizing endlines so git stops complaining about them being inconsistent.

2010-10-13 20:26:46 -04:00

OpenMetaverse.Http.XML

…

OpenMetaverse.Rendering.Meshmerizer.dll

update libomv libraries to 0.9.0

2011-05-31 18:47:13 +01:00

OpenMetaverse.StructuredData.dll

update libomv libraries to 0.9.0

2011-05-31 18:47:13 +01:00

OpenMetaverse.StructuredData.XML

* Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.

2010-10-30 02:06:43 -04:00

OpenMetaverse.XML

* Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.

2010-10-30 02:06:43 -04:00

OpenMetaverseTypes.dll

update libomv libraries to 0.9.0

2011-05-31 18:47:13 +01:00

OpenMetaverseTypes.XML

* Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.

2010-10-30 02:06:43 -04:00

opensim-ode.sh

…

OpenSim.32BitLaunch.exe

…

OpenSim.32BitLaunch.exe.config

…

OpenSim.32BitLaunch.pdb

…

OpenSim.addin.xml

…

OpenSim.ConsoleClient.exe.config

…

OpenSim.ConsoleClient.ini.example

…

OpenSim.exe.config

Fix broken inventory links on viewer 2.

2011-05-13 03:24:19 +01:00

OpenSim.ini.example

Add terminating quotes to http addresses in [SimulatorFeatures] section of OpenSim.ini.example.

2011-08-16 21:50:15 +01:00

OpenSim.Region.OptionalModules.Tests.dll.config

Get osNpcCreate appearance working with avatars that are currently in the scene.

2011-08-01 23:41:29 +01:00

OpenSim.Services.exe.config

…

OpenSimDefaults.ini

BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source.

2011-08-30 13:49:50 -07:00

OpenSimDefaults.ini.example

Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini

2010-09-13 16:23:22 -07:00

OpenSimExport.exe.config

…

pCampBot.exe.config

…

pCampBotSentences.txt

…

PhysX_Wrapper_Dotnet.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

PhysX-wrapper.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Prebuild.exe

also get "nant clean" to remove old .mdb from .exe and .dll

2011-08-30 23:20:54 +01:00

PrimMesher.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

PumaCode.SvnDotNet.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

RegionConfig.ini.example

Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.

2011-04-23 00:40:08 +01:00

Robust.32BitLaunch.exe

Compiled Robust.32BitLaunch.exe to .Net 3.5

2010-07-03 10:40:33 -07:00

Robust.32BitLaunch.exe.config

…

Robust.exe.config

adding -logconfig to Robust.exe

2010-10-01 05:42:18 +01:00

Robust.HG.ini.example

minor: Add explanative text for the new currency parameter. Convert some tabs to spaces

2011-08-22 00:58:11 +01:00

Robust.ini.example

minor: Add explanative text for the new currency parameter. Convert some tabs to spaces

2011-08-22 00:58:11 +01:00

shutdown_commands.txt

…

SimpleApp.exe.config

default to appending for log files per Mantis 530, and per

2008-02-12 00:39:08 +00:00

sqlite3.dll

In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.

2011-02-11 23:06:14 +00:00

startup_commands.txt.example

…

startuplogo.txt

…

Tools.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

Warp3D.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

XMLRPC.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

xunit.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00

zlib.net.dll

add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows

2011-04-27 23:57:26 +01:00