Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 6 | -6/+63 |
|\ | |||||
| * | libomv update to support headerless llsd binary deserialization needed for me... | Latif Khalifa | 2010-10-14 | 6 | -6/+63 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -70/+80 |
|\ \ | |/ | |||||
| * | laying some groundwork for mesh physics | dahlia | 2010-10-14 | 1 | -70/+80 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -4/+4 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 4 | -108/+171 |
| |\ | |||||
| * | | * Replacing Magic numbers with Enums | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -4/+4 |
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -3/+7 |
|\ \ \ | | |/ | |/| | |||||
| * | | Don't distroy attachments when using viewer 2.1+, strip multiple attachment data | Latif Khalifa | 2010-10-14 | 1 | -0/+4 |
| * | | Kill some magic numbers in the mesh upload module and change the mesh asset | Melanie | 2010-10-14 | 1 | -3/+3 |
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -105/+164 |
|\ \ \ | |/ / | |||||
| * | | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ... | Diva Canto | 2010-10-14 | 2 | -105/+164 |
| |/ | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 7 | -15645/+15726 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 |
| |\ | |||||
| * | | Updated to libomv-opensim r3449 | Latif Khalifa | 2010-10-14 | 7 | -15645/+15726 |
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -0/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | * A few additional cleanup elements | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 |
| |/ | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+1 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 3 | -16/+35 |
|\ \ | |/ | |||||
| * | * Tweaked the upload response and now at least uploading the mesh works. | Teravus Ovares (Dan Olivares) | 2010-10-14 | 3 | -16/+35 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 1 | -9/+17 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -3/+4 |
| |\ | |||||
| * | | Rename file + more testing and tweaking | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -9/+17 |
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-14 | 2 | -3/+4 |
|\ \ \ | | |/ | |/| | |||||
| * | | Kill some magic numbers in the caps module | Melanie | 2010-10-14 | 2 | -3/+4 |
| |/ | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 3 | -1/+451 |
|\ \ | |/ | |||||
| * | * Partially complete stuff for Mesh support that Melanie wanted to see before... | Teravus Ovares (Dan Olivares) | 2010-10-14 | 3 | -1/+451 |
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 5 | -27890/+27890 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 4 | -216/+35 |
| |\ | |||||
| * | | * Normalizing endlines so git stops complaining about them being inconsistent. | Teravus Ovares (Dan Olivares) | 2010-10-13 | 5 | -27893/+27893 |
| * | | 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 |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 1 | -204/+14 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix build break | Justin Clark-Casey (justincc) | 2010-10-13 | 1 | -1/+1 |
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 2 | -2/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-13 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | 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 |
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 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 encountering... | Diva Canto | 2010-10-13 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 1 | -9/+8 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change | Melanie | 2010-10-13 | 1 | -9/+8 |
| |/ / | |||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-13 | 2 | -7/+1381 |
|\ \ \ | |/ / | |||||
| * | | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa... | Diva Canto | 2010-10-13 | 2 | -7/+1381 |
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-10 | 1 | -8/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-10 | 3 | -3/+17 |
| |\ \ | | |/ |