diff options
author | Robert Adams | 2013-12-20 06:52:28 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-20 06:52:28 -0800 |
commit | a01862509ee3317dde34ffb5cdbaf98672b510c3 (patch) | |
tree | 335fe6b6be7e796b33f11f3e939605ba28af1df3 /OpenSim/Tests | |
parent | Merge branch 'master' into varregion (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.zip opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.gz opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.bz2 opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.xz |
Merge branch 'master' into varregion
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 (); |