Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 3 | -3/+46 |
|\ | |||||
| * | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL | Melanie | 2010-10-24 | 2 | -0/+30 |
| | | |||||
| * | 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' into mantis5110 | Jonathan Freedman | 2010-10-24 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | 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' into mantis5110 | Jonathan Freedman | 2010-10-24 | 3 | -5/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -193/+214 |
| |\ | |||||
| * | | Revert "* refactor refactor refactor ServerURI 4 lyfe" | Justin Clark-Casey (justincc) | 2010-10-22 | 14 | -72/+94 |
| | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98. | ||||
| * | | Revert "* additional serveruri cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 8 | -20/+54 |
| | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9. | ||||
| * | | Revert "* more url / hg cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 8 | -56/+45 |
| | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d. | ||||
| * | | Revert "* remove some spurious debug info" | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -22/+20 |
| | | | | | | | | | | | | This reverts commit 017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e. | ||||
| * | | 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 |
| | | | |||||
| * | | minor: add some text to the oar abort messages on assets timeout to make it ↵ | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | clear that the oar will not be usable | ||||
| * | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+71 |
| | | | |||||
| * | | This fixes a delay in llSetLinkPrimitiveParamsFast | AdelleF | 2010-10-21 | 1 | -1/+6 |
| | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
| * | | Deleted a verbose and unneeded log message. | Diva Canto | 2010-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 |
| | | | |||||
| * | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-21 | 1 | -2/+0 |
| | | | |||||
| * | | Fix the OOB error (#5102). Sorry, my bad. | Melanie | 2010-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | Skip empty strings in ParseString* functions | Melanie | 2010-10-21 | 1 | -0/+6 |
| | | | |||||
| * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-20 | 21 | -166/+123 |
| |\ \ | |||||
| | * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 3 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| | * | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 8 | -45/+56 |
| | | | | |||||
| | * | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 8 | -54/+20 |
| | | | | |||||
| | * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 14 | -94/+72 |
| | | | | |||||
* | | | | * throw debug message when no HomeURI is set | Jonathan Freedman | 2010-10-24 | 1 | -0/+2 |
| | | | | |||||
* | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 2 | -8/+6 |
| |_|/ |/| | | |||||
* | | | 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 |
| | | | | | | | | | | | | |