Melanie 1ebc9d04aa Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2012-01-05 08:15:33 +00:00

..

AssetTransaction

Merge branch 'master' into bigmerge

2011-11-14 20:03:47 +00:00

IPBan

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

TextureSender

Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.

2012-01-04 21:40:15 +00:00

Xfer

One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.

2010-12-24 08:50:00 -08:00