Commit Graph

14511 Commits (bd4e3b0aafd86d47bf1976ed7d83103dccee2a47)

Author SHA1 Message Date
Melanie bb1e35fbd9 Merge branch 'master' into careminster-presence-refactor 2010-10-13 18:44:58 +01:00
Melanie eeac2a9e6a Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-13 18:41:52 +01:00
Melanie Thielker ccd5610997 Correctly update the LastSeen field 2010-10-13 18:41:09 +01:00
Melanie Thielker 01728fb19e Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-10-13 18:40:33 +01:00
Diva Canto d7c9bc3b1c Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-10-13 10:39:01 -07:00
Diva Canto d890390ecf Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements. 2010-10-13 10:38:34 -07:00
Teravus Ovares (Dan Olivares) a132edbdae Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-13 12:42:02 -04:00
Teravus Ovares (Dan Olivares) 14a0f4fe9b *typical non-effectual commit to trigger a build 2010-10-13 12:40:21 -04:00
Melanie b4c718f93b Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change
.ini.example ";;" format to normal ini format, since the defaults file
is not parsed that way.
2010-10-13 17:07:13 +01:00
Diva Canto 54a3b8e079 New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet. 2010-10-13 08:16:41 -07:00
Melanie 3eb68c319e change default next owner persm to mod/trans to match SL. 2010-10-13 08:24:18 +02:00
Jonathan Freedman a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Jonathan Freedman 2654ab6300 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-10 18:06:27 -04:00
Melanie 0806d03780 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-10-10 22:08:54 +01:00
Melanie cb79e228e4 Merge branch 'master' into careminster-presence-refactor 2010-10-10 22:08:36 +01:00
Melanie 30f926aab6 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-10 22:07:51 +01:00
Melanie f2febb89fc Change the part for sound playback to be the root part / object UUID instead
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
Melanie 2804c97a39 Change the part for sound playback to be the root part / object UUID instead
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:06:47 +01:00
Melanie c2971a6398 Add group invites to the list of messages that get offlined 2010-10-10 20:15:02 +02: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 231feab57f Merge branch 'master' into careminster-presence-refactor
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01: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 ff49a21eca Fix a security relevant issue with take / take copy 2010-10-09 01:02:57 +02: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
Melanie 52dd547863 Make SendKillObject send multiple localIDs in one packet. This avoids the
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02: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 ba0afa53d3 Implement rezzing coalesced objects 2010-10-07 05:12:39 +02:00
Melanie 9a5d0984a5 Fix autoreturn to not return zero objects 2010-10-07 02:16:36 +01:00
Melanie 2db0ac74c7 Implement taking of coalesced objects.
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
2010-10-07 01:13:17 +02:00
Melanie abfede7819 Plumb the path for multiple object deletes 2010-10-06 20:00:51 +01:00
Melanie 42f76773a1 Plumb the path for multiple object deletes 2010-10-06 19:59:30 +02:00
Melanie ca50f6a82c Merge branch 'master' into careminster-presence-refactor 2010-10-06 05:45:29 +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 1a47ec082e Convert worldview to GET 2010-10-06 05:15:47 +02:00
Melanie b7586806cd Merge branch 'master' into careminster-presence-refactor 2010-10-06 03:52:57 +01:00