diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /OpenSim/Tests/Common/Mock | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index e2f57b5..a835925 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -760,7 +760,11 @@ namespace OpenSim.Tests.Common | |||
| 760 | { | 760 | { |
| 761 | } | 761 | } |
| 762 | 762 | ||
| 763 | public void SendAvatarDataImmediate(ISceneEntity avatar) | 763 | public void SendEntityFullUpdateImmediate(ISceneEntity ent) |
| 764 | { | ||
| 765 | } | ||
| 766 | |||
| 767 | public void SendEntityTerseUpdateImmediate(ISceneEntity ent) | ||
| 764 | { | 768 | { |
| 765 | } | 769 | } |
| 766 | 770 | ||