Melanie
|
7b9c4d2826
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
|
2012-07-16 21:32:10 +01:00 |
|
Justin Clark-Casey (justincc)
|
ec6a195e40
|
When generating a Warp3D texture, set the detailTexture[i] variable on resize from the JPEG2000 original rather than only saving it to disk.
This appears to be the cause of the warp 3d exception seen when starting a new region for the first time.
Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk.
Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
|
2012-07-14 01:11:30 +01:00 |
|
Melanie
|
e733fb32cf
|
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
|
2012-06-06 13:07:05 +01:00 |
|
Justin Clark-Casey (justincc)
|
514dd85199
|
minor: Change log messages on Warp3DImageModule to show they are from this module
|
2012-06-06 04:18:38 +01:00 |
|
Justin Clark-Casey (justincc)
|
53c25a4778
|
Rename MapImageModule for Warp3D to Warp3DImageModule to match its class name and make it easier to distinguish between map image modules.
|
2012-06-06 04:15:00 +01:00 |
|
Justin Clark-Casey (justincc)
|
2b0de66216
|
Actively dispose of Bitmaps in Warp3D image module and world map module once we've finished with them.
This might help with memory leakage issues though I suspect it won't.
|
2012-06-06 04:11:16 +01:00 |
|
Diva Canto
|
fd27988978
|
Changed the Map-related messages from Info to Debug. They're debug messages.
|
2012-04-23 21:29:18 -07:00 |
|
Melanie
|
5e3999c84c
|
Cache the last maptile and return the cachrd tile if the last request is
less than an hour ago. Avoids generating the maptile twice on startup.
|
2012-03-29 22:34:33 +02:00 |
|
Michael Cerquoni aka Nebadon Izumi
|
dc978d02a7
|
match water color for warp3d map tiler and adjust lighting
|
2011-06-13 12:37:43 +01:00 |
|
Justin Clark-Casey (justincc)
|
41105948bd
|
remove some mono compiler warnings
|
2011-01-21 23:19:52 +00:00 |
|
Teravus Ovares (Dan Olivares)
|
09bf9d5fca
|
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
|
2010-10-30 02:26:48 -04:00 |
|
Melanie
|
d45276b3f6
|
Add and plumb the usetex URL parameter to worldview. Required but not yet
functional
|
2010-10-06 05:44:19 +01:00 |
|
Melanie
|
c97398575c
|
Convert the map image modules to new style modules
|
2010-10-06 01:42:18 +01:00 |
|
Melanie
|
b424af6187
|
Revert an accidental default value change
|
2010-10-05 23:06:29 +01:00 |
|
Melanie
|
eb491d2c36
|
Patch to allow other cam angles. Not complete. Thanks, Antont.
|
2010-10-05 22:56:20 +01:00 |
|
Latif Khalifa
|
cb6e4035c7
|
Avoid throwing errors when adding existing meshes to the render scene
|
2010-10-04 06:02:09 +01:00 |
|
Melanie
|
4f70ac018b
|
Adapt to core changes
|
2010-10-03 16:40:11 +01:00 |
|
Melanie
|
27340f616e
|
Addign the new / renamed files for previous commit
|
2010-10-03 16:34:55 +01:00 |
|