aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Mock
diff options
context:
space:
mode:
authorMelanie2012-11-17 02:58:14 +0000
committerMelanie2012-11-17 02:58:14 +0000
commit7ad082f7c39ba82adeae3c25ca0befcf983c879d (patch)
tree0e3c488c65ef22b53e4536dd07f46c1467b58f78 /OpenSim/Tests/Common/Mock
parentMerge branch 'master' into careminster (diff)
parentPrevent a buffer overflow in asset receiving (diff)
downloadopensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.zip
opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.gz
opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.bz2
opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Tests/Common/Mock')
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index ebdfb4f..5ad3c9f 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Tests.Common.Mock
320 public event MuteListEntryRemove OnRemoveMuteListEntry; 320 public event MuteListEntryRemove OnRemoveMuteListEntry;
321 public event GodlikeMessage onGodlikeMessage; 321 public event GodlikeMessage onGodlikeMessage;
322 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; 322 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
323 323 public event GenericCall2 OnUpdateThrottles;
324#pragma warning restore 67 324#pragma warning restore 67
325 325
326 /// <value> 326 /// <value>