aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Add a setter to OldItemID so it can be deserializedMelanie2010-10-131-0/+3
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-133-16/+1389
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-131-1/+1
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-131-9/+8
| | |\
| | * | Comment a debug message so that it doesn't spew the console upon encountering...Diva Canto2010-10-131-1/+1
| * | | Correctly update the LastSeen fieldMelanie Thielker2010-10-131-1/+1
| * | | Ensure no UUID.Zero region ID is ever written to presence. Add a MigrationMelanie Thielker2010-10-132-1/+11
| | |/ | |/|
| * | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. ChangeMelanie2010-10-131-9/+8
| |/
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa...Diva Canto2010-10-132-7/+1381
* | change default next owner persm to mod/trans to match SL.Melanie2010-10-131-1/+4
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-102-14/+15
|\ \
| * | Add group invites to the list of messages that get offlinedMelanie2010-10-102-14/+15
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-103-3/+17
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-103-3/+17
| |\ \
| | * | * Make line endings consistant in Meshmerizer.csTeravus Ovares (Dan Olivares)2010-10-091-1/+1
| | * | Fix a typo in previouis commit: start must not pass the end of the fileLatif Khalifa2010-10-091-2/+2
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-094-20/+35
| | |\ \
| | | * | weird line endings fix commitTeravus Ovares (Dan Olivares)2010-10-091-7/+7
| | | * | Return error code instead of the last byte of the file if range is not satisf...Latif Khalifa2010-10-091-1/+9
| | | * | In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| | * | | Added missing sections to StandaloneHypergrid.iniDiva Canto2010-10-091-0/+6
| * | | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| | |/ / | |/| |
* | | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| |_|/ |/| |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-096-23/+41
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-092-17/+21
| |\ \
| | * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-10-091-4/+4
| | * | Limit formatting of local console output to actual logging messages.Marck2010-10-091-13/+17
| | |/
| * | Fix an infinite recursionMelanie2010-10-081-1/+4
| |/
| * Guard against locking a nullref to avoid build breakMelanie2010-10-081-0/+3
| * Change the order of actions to address a possible nullrefMelanie2010-10-081-3/+2
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-082-9/+9
| |\
| | * move CacheSculptMaps ini flag to OpenSimDefaults.inidahlia2010-10-072-9/+9
| * | Clarify the format comment at the top of OpenSim.ini.exampleMelanie2010-10-081-1/+4
| |/
| * add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map c...dahlia2010-10-072-1/+10
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| * Plumb the path for multiple object deletesMelanie2010-10-066-46/+45
* | Fix a security relevant issue with take / take copyMelanie2010-10-091-48/+62
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-0819-53/+79
* | Implement rezzing coalesced objectsMelanie2010-10-071-136/+182
* | Implement taking of coalesced objects.Melanie2010-10-074-207/+276
* | Plumb the path for multiple object deletesMelanie2010-10-066-46/+45
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-065-14/+20
|\ \ | |/
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-065-14/+20
| * Convert worldview to GETMelanie2010-10-061-7/+11
* | Convert worldview to GETMelanie2010-10-061-7/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-066-12/+305
|\ \ | |/
| * Change the URL /worldview to /worldview/<region id> to support multiregionMelanie2010-10-062-3/+4
| * Convert the BMP to a JPEG image and return it. This should be testable.Melanie2010-10-061-1/+7
| * Add the parameter plumbing and image generationMelanie2010-10-062-2/+22
| * Add WOrldView request handler and plumbingMelanie2010-10-062-0/+155