aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-1620-28269/+28913
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-10-1620-28269/+28913
| |\
| | * Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| | | | | | | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-150-0/+0
| | |\
| | | * one more silly line ending thing....Teravus Ovares (Dan Olivares)2010-10-141-71/+71
| | | | | | | | | | | | | | | | *If you have problems, fetch the tree and rebase.
| | * | one more silly line ending thing.... *If you have problems, fetch the tree ↵Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| | |/ | | | | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | * more work in progress on mesh physics - still non-functionaldahlia2010-10-143-24/+75
| | |
| | * libomv update to support headerless llsd binary deserialization needed for ↵Latif Khalifa2010-10-146-6/+63
| | | | | | | | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
| | |
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| | |\
| | | * Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | | |
| | | * Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| | | | | | | | | | | | | | | | type from 45 to 49 to match OMV trunk
| | | * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| | | | | | | | | | | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
| | * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| | |/
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| | |\ | | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| | | * * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| | | | | | | | | | | | | | | | | | | | * At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong. * Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
| | * | Updated to libomv-opensim r3449Latif Khalifa2010-10-147-15645/+15726
| | |/
| | * * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| | | | | | | | | | | | * At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
| | * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-143-16/+35
| | | | | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working.
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-3/+4
| | |\
| | | * Kill some magic numbers in the caps moduleMelanie2010-10-142-3/+4
| | | |
| | * | Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| | |/
| | * * Partially complete stuff for Mesh support that Melanie wanted to see ↵Teravus Ovares (Dan Olivares)2010-10-143-1/+451
| | | | | | | | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either.
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-134-216/+35
| | |\ | | | | | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini
| | | * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| | | |
| | | * fix build breakJustin Clark-Casey (justincc)2010-10-131-1/+1
| | | |
| | * | * Normalizing endlines so git stops complaining about them being inconsistent.Teravus Ovares (Dan Olivares)2010-10-135-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/opensimTeravus Ovares (Dan Olivares)2010-10-133-15/+1389
| | |\ \
| | * | | *typical non-effectual commit to trigger a buildTeravus Ovares (Dan Olivares)2010-10-131-3/+3
| | | | |
* | | | | Actually set the PrivateBinPath in XEngine so relocating the scriptsMelanie2010-10-162-6/+7
|/ / / / | | | | | | | | | | | | directory works
* | | | 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 ↵Diva Canto2010-10-131-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | encountering unknown xml elements.
| * | | | 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
| | |/ / | |/| | | | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL
| * | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. ChangeMelanie2010-10-131-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 Canto2010-10-132-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.Melanie2010-10-131-1/+4
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-102-14/+15
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | 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 ↵Latif Khalifa2010-10-091-1/+9
| | | | | | | | | | | | | | | | | | | | satisfiable
generated by cgit v1.1 at 2024-12-16 07:19:37 +0000