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/CoreModules/World/LegacyMap | |
| parent | Convert worldview to GET (diff) | |
| parent | Add and plumb the usetex URL parameter to worldview. Required but not yet (diff) | |
| download | opensim-SC-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.zip opensim-SC-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.tar.gz opensim-SC-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.tar.bz2 opensim-SC-ca50f6a82cb7c5385ebfa633a5cf1672a6415b95.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/LegacyMap')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index c9ef1f4..f86c790 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |||
| @@ -560,7 +560,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
| 560 | return returnpt; | 560 | return returnpt; |
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height) | 563 | public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures) |
| 564 | { | 564 | { |
| 565 | return null; | 565 | return null; |
| 566 | } | 566 | } |