Melanie 2cf6172689 Merge branch 'master' into bigmerge ...

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

2011-11-05 11:05:32 +00:00

..

Tests

Fix NPC sitting for prims without a sit target.

2011-11-05 01:38:42 +00:00

NPCAvatar.cs

Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge

2011-10-25 02:54:34 +01:00

NPCModule.cs

Fix NPC sitting for prims without a sit target.

2011-11-05 01:38:42 +00:00