Justin Clark-Casey (justincc) a133acbd5f Merge branch 'iar-merge' ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs

2010-08-04 20:56:52 +01:00

..

Api

Merge branch 'iar-merge'

2010-08-04 20:56:52 +01:00

CodeTools

Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the

2010-06-01 14:20:39 +01:00

Instance

Stopgap measure. Disable the recent script startup changes until I can cure the

2010-04-19 14:14:31 +01:00

Tests

* ShortVersion, another attempt at fixing the test thread death that randomly occurs.

2009-08-16 12:14:49 -04:00

AssemblyResolver.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

Helpers.cs

Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity"

2009-10-02 00:47:01 +01:00

LSL_Types.cs

These 2 files want to be committed.

2010-07-08 16:05:59 -07:00