Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-29 | 4 | -261/+235 |
|\ | |||||
| * | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 4 | -261/+235 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-28 | 2 | -20/+28 |
|\ \ | |/ | |||||
| * | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵ | Marck | 2010-10-28 | 2 | -20/+28 |
| | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096. | ||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-27 | 2 | -2/+1 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-27 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Prevent nullrefs in scene object deletion. Mantis #5156 | Melanie | 2010-10-27 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-26 | 1 | -9/+27 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-26 | 9 | -63/+37 |
| |\ | |||||
| * | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵ | dahlia | 2010-10-26 | 1 | -9/+27 |
| | | | | | | | | | | | | specific applications | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-26 | 9 | -63/+37 |
|\ \ \ | | |/ | |/| | |||||
| * | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 9 | -63/+37 |
| |/ | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-24 | 7 | -12/+13 |
|\ \ | |/ | |||||
| * | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 7 | -12/+13 |
| | | | | | | | | Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds. | ||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-24 | 2 | -0/+30 |
|\ \ | |/ | |||||
| * | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL | Melanie | 2010-10-24 | 2 | -0/+30 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-23 | 1 | -3/+16 |
|\ \ | |/ | |||||
| * | Added inner exception handling in Shape deserialization processing, so that ↵ | Diva Canto | 2010-10-23 | 1 | -3/+16 |
| | | | | | | | | the whole Shape processing returns a valid Shape object. | ||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-22 | 25 | -214/+193 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 |
| |\ | |||||
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -214/+193 |
| | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-22 | 1 | -3/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Change some exception to use ToString(). e.Message is not sufficient to fix | Melanie | 2010-10-22 | 1 | -3/+3 |
| |/ | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps! | ||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-22 | 10 | -44/+108 |
|\ \ | |/ | |||||
| * | Merge remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -193/+214 |
| |\ | |||||
| | * | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 25 | -193/+214 |
| | |\ | |||||
| | | * | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 10 | -44/+108 |
| | | | | |||||
| | | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 3 | -20/+68 |
| | | |\ | |||||
| | | * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 3 | -20/+22 |
| | | | | | |||||
| | | * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 2 | -8/+379 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 13 | -67/+123 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 40 | -28231/+30424 |
| | | |\ \ \ \ | |||||
| | | * | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 8 | -45/+56 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 8 | -32/+55 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 16 | -72/+382 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 18 | -30083/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 3 | -3/+20 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 45 | -27668/+28159 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 20 | -71/+1506 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 8 | -54/+20 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 14 | -94/+72 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix llParcelMediaCommandList() so that it applies commands only to the ↵ | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel that the script is in, not all parcels. Patch from http://opensimulator.org/mantis/view.php?id=2738 Thanks snoopy and fineman. | ||||
| | * | | | | | | | | | | | | Allow OARs and IARs to save and load meshes. | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation. | ||||
| | * | | | | | | | | | | | | 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 | 2 | -3/+20 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | ||||
| | * | | | | | | | | | | | | slightly simplify oar control file loading code | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -10/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -5/+8 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+71 |
| | | | | | | | | | | | | | |