diff options
| author | Melanie | 2011-05-05 09:49:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-05 09:49:10 +0100 |
| commit | 4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c (patch) | |
| tree | 24e24cb7b424df74b13788d28be9d7588fbd99d0 /OpenSim/Region/DataSnapshot | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Test m_Enabled on RemoveRegion. (diff) | |
| download | opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.zip opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.gz opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.bz2 opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 964e4b9..a505999 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |||
| @@ -36,7 +36,7 @@ using OpenSim.Framework.Capabilities; | |||
| 36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
| 37 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
| 38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
| 39 | using Caps=OpenSim.Framework.Capabilities.Caps; | 39 | using Caps = OpenSim.Framework.Capabilities.Caps; |
| 40 | 40 | ||
| 41 | namespace OpenSim.Region.DataSnapshot | 41 | namespace OpenSim.Region.DataSnapshot |
| 42 | { | 42 | { |