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

..

HttpServer

Increased the rate of the PollServiceRequestManager to 0.5 secs (it was 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.

2013-07-26 21:40:04 -07:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

Tests

Merge branch 'master' into careminster

2013-02-07 20:51:51 +00:00

BaseOpenSimServer.cs

Merge branch 'master' into careminster

2013-06-23 01:59:57 +01:00

MainServer.cs

Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.

2013-07-26 19:22:30 +01:00

ServerBase.cs

Merge branch 'master' into careminster

2013-08-07 23:29:42 +01:00

VersionInfo.cs

Merge branch 'master' into careminster

2013-02-05 21:30:12 +00:00