Melanie afca742392 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2011-11-14 20:03:47 +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

Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.

2010-12-23 10:05:08 -08: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