diff options
| author | Melanie | 2010-10-06 05:45:29 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-06 05:45:29 +0100 |
| commit | ca50f6a82cb7c5385ebfa633a5cf1672a6415b95 (patch) | |
| tree | 795b9d2c93dc2e92bfa7366d1af391bb76d4971d /OpenSim/Region/Framework/Interfaces | |
| parent | Convert worldview to GET (diff) | |
| parent | Add and plumb the usetex URL parameter to worldview. Required but not yet (diff) | |
| download | opensim-SC_OLD-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.zip opensim-SC_OLD-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.tar.gz opensim-SC_OLD-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.tar.bz2 opensim-SC_OLD-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrain.cs b/OpenSim/Region/Framework/Interfaces/ITerrain.cs index 38cf020..815a2d8 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrain.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrain.cs | |||
| @@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 75 | public interface IMapImageGenerator | 75 | public interface IMapImageGenerator |
| 76 | { | 76 | { |
| 77 | System.Drawing.Bitmap CreateMapTile(); | 77 | System.Drawing.Bitmap CreateMapTile(); |
| 78 | System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height); | 78 | System.Drawing.Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures); |
| 79 | byte[] WriteJpeg2000Image(); | 79 | byte[] WriteJpeg2000Image(); |
| 80 | } | 80 | } |
| 81 | } | 81 | } |