diff options
| author | BlueWall | 2012-02-03 18:20:26 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-03 18:20:26 -0500 |
| commit | 0742630d813259483f0e56d1c6b807de78924c54 (patch) | |
| tree | 8dacf402c0cd7065403f1f8c9735214825011448 /OpenSim/Tests | |
| parent | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff) | |
| parent | Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... (diff) | |
| download | opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.zip opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.tar.gz opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.tar.bz2 opensim-SC-0742630d813259483f0e56d1c6b807de78924c54.tar.xz | |
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 4d3d257..14c1287 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -972,7 +972,7 @@ namespace OpenSim.Tests.Common.Mock | |||
| 972 | { | 972 | { |
| 973 | } | 973 | } |
| 974 | 974 | ||
| 975 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 975 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) |
| 976 | { | 976 | { |
| 977 | } | 977 | } |
| 978 | 978 | ||