diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Tests/Common | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Tests/Common')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 2fe22a5..81a5cf7 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -702,11 +702,6 @@ namespace OpenSim.Tests.Common.Mock | |||
| 702 | { | 702 | { |
| 703 | } | 703 | } |
| 704 | 704 | ||
| 705 | public UUID GetDefaultAnimation(string name) | ||
| 706 | { | ||
| 707 | return UUID.Zero; | ||
| 708 | } | ||
| 709 | |||
| 710 | public void SendTakeControls(int controls, bool passToAgent, bool TakeControls) | 705 | public void SendTakeControls(int controls, bool passToAgent, bool TakeControls) |
| 711 | { | 706 | { |
| 712 | } | 707 | } |