| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 4 | -18/+86 |
| |\ | |||||
| | * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 |
| | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 1 | -3/+3 |
| | |\ | |||||
| | | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -17/+65 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -0/+329 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 1 | -3/+3 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 3 | -0/+480 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 1 | -2/+10 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -7/+7 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | print IAR version number on console when saving | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | ||||
| | * | | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -4/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -8/+36 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 3 | -5/+384 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -3/+3 |
| | |/ / / / / / / | |||||
| | * | | | | | | | * One more goofy thing. I note that the sculpt texture id is broken out of ↵ | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately. | ||||
| | * | | | | | | | * This removes an ugly extraparams hack that I used and makes ↵ | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -17/+62 |
| | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | UploadObjectAsset into a generic linkset upload tool. | ||||
| | * | | | | | | * This concludes UploadObjectAsset for now until the permissions and physics ↵ | Teravus Ovares (Dan Olivares) | 2010-10-19 | 1 | -48/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shape are added to the message serialization. * You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them. * Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D | ||||
| | * | | | | | | * Almost complete implementation of UploadObjectAsset cap. all meshes get ↵ | Teravus Ovares (Dan Olivares) | 2010-10-18 | 1 | -0/+301 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | uploaded but they're improperly positioned/oriented at the moment. | ||||
| | * | | | | | Stop the InventoryTransferModule logging every IM notification it receives, ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -3/+3 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | even if they are nothing to do with it. | ||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 3 | -0/+480 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | A couple of more ways attachment point is sent | Latif Khalifa | 2010-10-15 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| | * | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | type from 45 to 49 to match OMV trunk | ||||
| | * | | | | | * Replacing Magic numbers with Enums | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -4/+4 |
| | |/ / / / | |||||
| | * | | | | * A few additional cleanup elements | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -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. | ||||
| | * | | | | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -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-14 | 2 | -16/+21 |
| | | | | | | | | | | | | | | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working. | ||||
| | * | | | | 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 | 2 | -0/+449 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
| * | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-10 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 1 | -2/+10 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| | * | | | Fix a typo in previouis commit: start must not pass the end of the file | Latif Khalifa | 2010-10-09 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | 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. | ||||
| * | | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 2 | -7/+7 |
| |\ \ \ | |/ / | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2010-10-04 | 2 | -7/+7 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -0/+3 |
| |\ \ | |/ | |||||
| | * | Prevent dropping someone else's attachments | Melanie | 2010-09-30 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Quash the region ID on intersim messages. That prevents people from determining | Melanie | 2010-09-27 | 1 | -1/+1 |
| | | | | | | | | | another avatars location | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 1 | -1/+2 |
| |\ \ | |/ | |||||
| | * | When receiving intersim IM, don't let the spoof protection bomb | Melanie | 2010-09-26 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+2 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |