Merge branch 'avination'

Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
This commit is contained in:
Melanie
2013-01-19 21:49:33 +01:00
14 changed files with 259 additions and 487 deletions

View File

@@ -2398,6 +2398,8 @@ namespace OpenSim.Region.Framework.Scenes
if (pa != null)
pa.PIDActive = false;
RootPart.ScheduleTerseUpdate(); // send a stop information
}
public void rotLookAt(Quaternion target, float strength, float damping)