Melanie 7dad1ded2e Merge branch 'master' into careminster ...

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

2012-03-29 00:27:35 +01:00

..

Tests

Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.

2012-03-20 23:12:21 +00:00

NPCAvatar.cs

Merge branch 'master' into careminster

2012-03-29 00:27:35 +01:00

NPCModule.cs

Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914

2012-03-06 01:27:30 +00:00