Melanie 005c69511d Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-08-07 23:29:42 +01: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

UserProfiles

2013-05-30 17:59:18 -04: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

Some more fixes on strange behaviors of Unknown User, esp. related to large messy inventories and esp. related to kokua

2013-07-06 18:02:17 -07: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-08-07 23:29:42 +01:00

UserAccounts

Merge branch 'master' into careminster

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