596af3f600
Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs |
||
---|---|---|
.. | ||
ApplicationPlugins | ||
Client | ||
ConsoleClient | ||
Data | ||
Framework | ||
Grid | ||
Region | ||
Server | ||
Services | ||
TestSuite | ||
Tests | ||
Tools |