diff options
author | UbitUmarov | 2015-09-08 15:03:22 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-08 15:03:22 +0100 |
commit | 5b3e2ab9aaf98892f18f733a3c5de816662be42a (patch) | |
tree | 03077685e44648264523e1851cd068d51a507e81 /OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs | |
parent | add script events per sec stat, using the time report code, but ignoring the... (diff) | |
parent | More 'everything is a module' merging. (diff) | |
download | opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.zip opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.gz opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.bz2 opensim-SC-5b3e2ab9aaf98892f18f733a3c5de816662be42a.tar.xz |
Merge branch 'mbworknew1' into ubitworkvarnew
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs index edc0a52..8250e6c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs | |||
@@ -37,7 +37,6 @@ using NUnit.Framework; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenMetaverse.Assets; | 38 | using OpenMetaverse.Assets; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | ||
41 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; | 42 | using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; |