Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00:00

..

Asset

Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()

2013-06-11 23:55:45 +01:00

Authentication

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Authorization

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Avatar

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Grid

Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.

2013-09-02 17:27:45 +01:00

GridUser

Put guards on a bunch of exception-inducing code, as seen in logs from load test.

2013-07-09 14:12:52 -07:00

Inventory

refactor: replace verbose checks with String.IsNullOrEmpty where applicable.

2013-11-15 21:45:08 +00:00

Land

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

MapImage

Merge branch 'master' into careminster

2013-02-04 19:21:39 +00:00

Neighbour

Last 27 modules' directives (service connectors out).

2012-11-13 08:49:52 -08:00

Presence

Further tweaks on TPs: not sending the callback URL and instead waiting 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement.

2013-07-24 14:27:37 -07:00

Simulation

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

UserAccounts

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00