Melanie bef03fb30b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

BunchOfCaps

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00

EventQueue

Merge branch 'master' into careminster

2013-08-13 22:53:47 +01:00

ObjectCaps

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

AvatarPickerSearchModule.cs

minor: Comment out AvatarPicketSearch caps log message for now, which is occuring on every login and entity transfer

2013-08-14 23:22:52 +01:00

FetchInventory2Module.cs

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

GetMeshModule.cs

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00

GetTextureModule.cs

Merge branch 'master' into careminster

2013-08-01 01:23:24 +01:00

MeshUploadFlagModule.cs

Merge branch 'master' into careminster

2013-03-05 23:57:53 +00:00

RegionConsoleModule.cs

Merge branch 'master' into careminster

2013-07-13 00:47:58 +01:00

SimulatorFeaturesModule.cs

Doing the HG Map / SimulatorFeatures "the right way": moved it to HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does).

2013-07-30 21:10:00 -07:00

UploadBakedTextureModule.cs

Merge branch 'master' into careminster

2013-07-13 00:57:03 +01:00

WebFetchInvDescModule.cs

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00