Commit Graph

15436 Commits (58f2c9e2241fb5085dc6b8e025a441040eaf7f25)

Author SHA1 Message Date
opensim mirror account 1ee628c7d5 Merge branch 'master' of git@github.com:opensim/opensim 2010-10-09 11:06:33 -07:00
Teravus Ovares (Dan Olivares) cf61cf7b32 * Make line endings consistant in Meshmerizer.cs 2010-10-09 13:50:53 -04:00
Latif Khalifa 0dd4071156 Fix a typo in previouis commit: start must not pass the end of the file 2010-10-09 18:22:21 +02:00
Diva Canto aeecdd1430 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-10-09 09:09:38 -07:00
Diva Canto 78f6fe0b31 Added missing sections to StandaloneHypergrid.ini 2010-10-09 09:09:16 -07:00
Teravus Ovares (Dan Olivares) 3454dfbcb3 weird line endings fix commit 2010-10-09 12:07:58 -04:00
Latif Khalifa 5e381ec67c Return error code instead of the last byte of the file if range is not satisfiable 2010-10-09 18:01:11 +02:00
Latif Khalifa 06d3a529a9 In case when 1 single byte is requested (yes viewer does this)
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.

End can also be 0, valid request for the firt byte of the file is 0-0.

Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
Melanie 96080dc492 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-09 01:05:05 +01:00
Justin Clark-Casey (justincc) ed161020e2 minor: remove some mono compiler warnings 2010-10-09 01:46:29 +01:00
Marck 211ea5d521 Limit formatting of local console output to actual logging messages.
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
Melanie 4a57288577 Fix an infinite recursion 2010-10-08 23:23:07 +01:00
Melanie 4a0911bdbd Guard against locking a nullref to avoid build break 2010-10-08 19:19:07 +01:00
Melanie 5dcbbb726a Change the order of actions to address a possible nullref 2010-10-08 18:40:13 +01:00
Jonathan Freedman 4adada6fe4 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-07 23:47:39 -04:00
Melanie 1e66f79a4e Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-08 03:09:04 +01:00
dahlia 0d9c94033d move CacheSculptMaps ini flag to OpenSimDefaults.ini
comment it and change defailt to true to reflect code
2010-10-07 19:48:17 -07:00
dahlia 9391c3ffee add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing 2010-10-07 19:34:46 -07:00
Melanie 12bc6a7414 Clarify the format comment at the top of OpenSim.ini.example 2010-10-08 03:08:05 +01:00
Melanie 9a5d0984a5 Fix autoreturn to not return zero objects 2010-10-07 02:16:36 +01:00
Melanie abfede7819 Plumb the path for multiple object deletes 2010-10-06 20:00:51 +01: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 9a1c8db443 Convert worldview to GET 2010-10-06 05:17:31 +01:00
Melanie 623f57deb5 Change the URL /worldview to /worldview/<region id> to support multiregion 2010-10-06 03:51:55 +01:00
Melanie 752b6a8764 Convert the BMP to a JPEG image and return it. This should be testable. 2010-10-06 03:40:55 +01:00
Melanie abfcd168fc Add the parameter plumbing and image generation 2010-10-06 03:32:01 +01:00
Melanie 17316170a5 Add WOrldView request handler and plumbing 2010-10-06 03:03:10 +01:00
Melanie 7d62ab6a9e Fix incorrect class name 2010-10-06 02:16:42 +01:00
Melanie ce89f08f6b Add WorldView module skeleton 2010-10-06 02:06:50 +01:00
Melanie c97398575c Convert the map image modules to new style modules 2010-10-06 01:42:18 +01:00
Jonathan Freedman 84cf0ffbf1 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 20:06:27 -04:00
Jonathan Freedman 593fc5c87a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 19:45:37 -04:00
Melanie 613bdb40bd Remove sirikata project 2010-10-06 00:22:08 +01:00
Melanie 7e6a047769 Remove defunct sirikata client stack 2010-10-06 00:20:41 +01:00
Melanie 5d61323192 Add the view generating method to the image generator interface 2010-10-05 23:49:21 +01:00
Melanie b424af6187 Revert an accidental default value change 2010-10-05 23:06:29 +01:00
Melanie 4a171af0cc Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-05 22:57:05 +01:00
Melanie eb491d2c36 Patch to allow other cam angles. Not complete. Thanks, Antont. 2010-10-05 22:56:20 +01:00
Jonathan Freedman 8f1acb890a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 14:17:18 -04:00
Jeff Ames 07122614d5 Formatting cleanup. 2010-10-04 22:44:22 -04:00
Melanie ba0a19c228 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-05 02:12:35 +01:00
Jeff Ames bc9f793a92 Formatting cleanup. 2010-10-04 21:28:17 -04:00
BlueWall eb17d581d3 Make windlight set the default environment on start 2010-10-05 01:54:15 +01:00
Jeff Ames eeca0ee009 Formatting cleanup. 2010-10-04 17:10:07 -04:00
Latif Khalifa cb6e4035c7 Avoid throwing errors when adding existing meshes to the render scene 2010-10-04 06:02:09 +01:00
Melanie 0e7e92b67f Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-04 04:49:09 +01:00
Diva Canto 37231e0941 Made the home agent handler check for xff if behind a proxy. 2010-10-03 21:21:02 -07:00
Latif Khalifa 67cfde3fb4 Added Meshmerizer rendering plugin for libomv 2010-10-04 04:48:42 +01:00
Latif Khalifa adc3cfdcdc Removed linden renderer 2010-10-04 04:44:33 +01:00
Latif Khalifa 940246f2d5 Use libomv 0.8.4.3445 2010-10-04 04:44:16 +01:00