diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs index eb79711..5151567 100644 --- a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs | |||
@@ -25,24 +25,14 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | <<<<<<< HEAD | ||
29 | using System.Drawing; | ||
30 | using OpenSim.Framework; | ||
31 | ======= | ||
32 | using OpenMetaverse; | 28 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
34 | using System.Drawing; | 30 | using System.Drawing; |
35 | >>>>>>> avn/ubitvar | ||
36 | 31 | ||
37 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
38 | { | 33 | { |
39 | public interface IMapImageUploadModule | 34 | public interface IMapImageUploadModule |
40 | { | 35 | { |
41 | <<<<<<< HEAD | ||
42 | void UploadMapTile(IScene scene, Bitmap mapTile); | ||
43 | } | ||
44 | } | ||
45 | ======= | ||
46 | /// <summary> | 36 | /// <summary> |
47 | /// Upload a new maptile | 37 | /// Upload a new maptile |
48 | /// </summary> | 38 | /// </summary> |
@@ -50,4 +40,3 @@ namespace OpenSim.Region.Framework.Interfaces | |||
50 | void UploadMapTile(IScene scene, Bitmap mapTile); | 40 | void UploadMapTile(IScene scene, Bitmap mapTile); |
51 | } | 41 | } |
52 | } | 42 | } |
53 | >>>>>>> avn/ubitvar | ||