diff options
author | Justin Clark-Casey (justincc) | 2013-12-19 01:41:04 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-12-19 01:41:04 +0000 |
commit | 68773ee7c4730a0227717e2549cd7fa8f873781e (patch) | |
tree | 3e6b5de25f14029597d6c4a2a5c9851a24ead347 /OpenSim/Tests | |
parent | Fix issue with editing notes for other avatars (diff) | |
parent | Add missing viewer param elements for butt and breast physics. (diff) | |
download | opensim-SC_OLD-68773ee7c4730a0227717e2549cd7fa8f873781e.zip opensim-SC_OLD-68773ee7c4730a0227717e2549cd7fa8f873781e.tar.gz opensim-SC_OLD-68773ee7c4730a0227717e2549cd7fa8f873781e.tar.bz2 opensim-SC_OLD-68773ee7c4730a0227717e2549cd7fa8f873781e.tar.xz |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs index 6707019..e666433 100644 --- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs +++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | |||
@@ -38,6 +38,7 @@ using OpenMetaverse; | |||
38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Servers; | 40 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Region.ClientStack.Linden; | ||
41 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
43 | 44 | ||
@@ -164,7 +165,7 @@ namespace OpenSim.Tests.Common | |||
164 | throw new System.NotImplementedException (); | 165 | throw new System.NotImplementedException (); |
165 | } | 166 | } |
166 | 167 | ||
167 | public OSD BuildEvent (string eventName, OSD eventBody) | 168 | public OSD BuildEvent(string eventName, OSD eventBody) |
168 | { | 169 | { |
169 | Console.WriteLine("TWO"); | 170 | Console.WriteLine("TWO"); |
170 | throw new System.NotImplementedException (); | 171 | throw new System.NotImplementedException (); |