| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -3/+4 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | Kill some magic numbers in the caps module | Melanie | 2010-10-14 | 2 | -3/+4 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | Rename file + more testing and tweaking | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -9/+17 | |
| | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 3 | -1/+451 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | |||||
| | | * | | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 4 | -216/+35 | |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini | |||||
| | | | * | | | | | | | | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | fix build break | Justin Clark-Casey (justincc) | 2010-10-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | * Normalizing endlines so git stops complaining about them being inconsistent. | Teravus Ovares (Dan Olivares) | 2010-10-13 | 5 | -27893/+27893 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy. | |||||
| | | * | | | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 3 | -15/+1389 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | *typical non-effectual commit to trigger a build | Teravus Ovares (Dan Olivares) | 2010-10-13 | 1 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Actually set the PrivateBinPath in XEngine so relocating the scripts | Melanie | 2010-10-16 | 2 | -6/+7 | |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory works | |||||
| * | | | | | | | | | | | Add a setter to OldItemID so it can be deserialized | Melanie | 2010-10-13 | 1 | -0/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-13 | 3 | -16/+1389 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-13 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-13 | 1 | -9/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Comment a debug message so that it doesn't spew the console upon ↵ | Diva Canto | 2010-10-13 | 1 | -1/+1 | |
| | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encountering unknown xml elements. | |||||
| | * | | | | | | | | | | | Correctly update the LastSeen field | Melanie Thielker | 2010-10-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Ensure no UUID.Zero region ID is ever written to presence. Add a Migration | Melanie Thielker | 2010-10-13 | 2 | -1/+11 | |
| | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL | |||||
| | * | | | | | | | | | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change | Melanie | 2010-10-13 | 1 | -9/+8 | |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .ini.example ";;" format to normal ini format, since the defaults file is not parsed that way. | |||||
| | * | | | | | | | | | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵ | Diva Canto | 2010-10-13 | 2 | -7/+1381 | |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet. | |||||
| * | | | | | | | | | change default next owner persm to mod/trans to match SL. | Melanie | 2010-10-13 | 1 | -1/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-10 | 2 | -14/+15 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * | | | | | | | | | Add group invites to the list of messages that get offlined | Melanie | 2010-10-10 | 2 | -14/+15 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 3 | -3/+17 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-10 | 3 | -3/+17 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| | | * | | | | | | | | * Make line endings consistant in Meshmerizer.cs | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fix a typo in previouis commit: start must not pass the end of the file | Latif Khalifa | 2010-10-09 | 1 | -2/+2 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-09 | 4 | -20/+35 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | weird line endings fix commit | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -7/+7 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | Return error code instead of the last byte of the file if range is not ↵ | Latif Khalifa | 2010-10-09 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | satisfiable | |||||
| | | | * | | | | | | | | In case when 1 single byte is requested (yes viewer does this) | Latif Khalifa | 2010-10-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | | * | | | | | | | | | Added missing sections to StandaloneHypergrid.ini | Diva Canto | 2010-10-09 | 1 | -0/+6 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Change the part for sound playback to be the root part / object UUID instead | Melanie | 2010-10-10 | 1 | -8/+8 | |
| | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the child prim because using the child prim plain doesn't work. | |||||
| * | | | | | | | | | | Change the part for sound playback to be the root part / object UUID instead | Melanie | 2010-10-10 | 1 | -8/+8 | |
| | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | of the child prim because using the child prim plain doesn't work. | |||||
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 6 | -23/+41 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||||
| | * | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-09 | 2 | -17/+21 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-10-09 | 1 | -4/+4 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Limit formatting of local console output to actual logging messages. | Marck | 2010-10-09 | 1 | -13/+17 | |
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | | Fix an infinite recursion | Melanie | 2010-10-08 | 1 | -1/+4 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Guard against locking a nullref to avoid build break | Melanie | 2010-10-08 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Change the order of actions to address a possible nullref | Melanie | 2010-10-08 | 1 | -3/+2 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| | * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-08 | 2 | -9/+9 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | move CacheSculptMaps ini flag to OpenSimDefaults.ini | dahlia | 2010-10-07 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comment it and change defailt to true to reflect code | |||||
| | * | | | | | | | Clarify the format comment at the top of OpenSim.ini.example | Melanie | 2010-10-08 | 1 | -1/+4 | |
| | |/ / / / / / | ||||||
| | * | | | | | | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 2 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caching for meshing | |||||
| | * | | | | | | Fix autoreturn to not return zero objects | Melanie | 2010-10-07 | 1 | -6/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 6 | -46/+45 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix a security relevant issue with take / take copy | Melanie | 2010-10-09 | 1 | -48/+62 | |
| | | | | | | | | ||||||
| * | | | | | | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 19 | -53/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | |||||
| * | | | | | | | Implement rezzing coalesced objects | Melanie | 2010-10-07 | 1 | -136/+182 | |
| | | | | | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |