Jonathan Freedman d219317074 Merge branch 'master' into mantis5110 ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2010-10-29 23:12:51 -04:00

..

Assets

Merge branch 'master' of ssh://MyConnection/var/git/opensim

2010-10-14 12:24:07 -04:00

Attachments

Major refactoring of appearance handling.

2010-10-20 16:17:54 -07:00

AvatarFactory

Configuration of persistent baked textures and save/send delays.

2010-10-28 12:00:04 -07:00

Chat

Formatting cleanup.

2010-10-27 00:01:03 -04:00

Combat

Formatting cleanup.

2010-09-12 13:43:49 -04:00

Dialog

Some code cleanup for console command alert.

2010-08-20 17:53:21 +01:00

Friends

Formatting cleanup.

2010-10-04 21:28:17 -04:00

Gestures

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

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

Gods

Formatting cleanup.

2010-09-12 13:43:49 -04:00

Groups

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

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

InstantMessage

Revert "Merge remote branch 'otakup0pe/mantis5110'"

2010-10-22 23:52:07 +01:00

Inventory

Formatting cleanup.

2010-10-27 00:01:03 -04:00

Lure

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

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

NPC

Add copyright header. Formatting cleanup.

2009-08-21 15:47:55 +09:00

ObjectCaps

* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.

2010-10-20 01:23:54 -04:00