Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵ | Teravus Ovares (Dan Olivares) | 2010-10-30 | 1 | -1/+1 | |
| | | | | | | | | to using prim.GetWorldPosition() in the warp renderer. | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | for now, comment out some older or redundant log debug lines to make ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+1 | |
| | | | | | | | | diagnostics easier | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -43/+20 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-27 | 2 | -43/+20 | |
| | | ||||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 | |
|/ | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
* | Merge remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 | |
|\ | ||||||
| * | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 1 | -2/+2 | |
| |\ | ||||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 7 | -60/+129 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 2 | -22/+52 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -3/+18 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -0/+6 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 9 | -47/+1413 | |
| | |\ \ \ \ \ | ||||||
| | * | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98. | |||||
* | | | | | | | Revert "* additional serveruri cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9. | |||||
* | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+2 | |
| | | | | | | | ||||||
* | | | | | | | 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 | |||||
* | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | .NET automagical serialization of SOPs replaced by manual serialization ↵ | Diva Canto | 2010-10-17 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | across the board. | |||||
* | | | | | | Drop max oar loading version back to 0 from 1 | Justin Clark-Casey (justincc) | 2010-10-16 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Rip out version option since it turns out that the changed object ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 2 | -7/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | serialization format can actually be loaded by older OpenSims after all This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now. | |||||
* | | | | | | change --old-guids switch on the save oar command line to --version=<x> | Justin Clark-Casey (justincc) | 2010-10-16 | 5 | -9/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier also add various informational notices about what version we've saving/loading | |||||
* | | | | | | Have OpenSim throw a strop if it tries to load an OAR with a major version ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 2 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | that is too high for it to handle | |||||
* | | | | | | save oar control file first rather than in the middle so that it's the first ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 3 | -38/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thing we come accross on load this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now | |||||
* | | | | | | Fix test break - TestSerializeXml2() still requires old-guids option | Justin Clark-Casey (justincc) | 2010-10-16 | 1 | -3/+6 | |
| | | | | | | ||||||
* | | | | | | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵ | Diva Canto | 2010-10-15 | 5 | -17/+28 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. | |||||
* | | | | | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 2 | -10/+12 | |
| | | | | | | | | | | | | | | | | | | | | functional | |||||
* | | | | | Convert the map image modules to new style modules | Melanie | 2010-10-06 | 2 | -12/+40 | |
| |_|_|/ |/| | | | ||||||
* | | | | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Revert an accidental default value change | Melanie | 2010-10-05 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Patch to allow other cam angles. Not complete. Thanks, Antont. | Melanie | 2010-10-05 | 1 | -4/+14 | |
| |_|/ |/| | | ||||||
* | | | Avoid throwing errors when adding existing meshes to the render scene | Latif Khalifa | 2010-10-04 | 1 | -0/+6 | |
| |/ |/| | ||||||
* | | Adapt to core changes | Melanie | 2010-10-03 | 1 | -1/+1 | |
| | | ||||||
* | | Addign the new / renamed files for previous commit | Melanie | 2010-10-03 | 8 | -0/+2655 | |
| | | ||||||
* | | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 5 | -1290/+1 | |
|/ | ||||||
* | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -1/+1 | |
| | | | | original patch | |||||
* | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -13/+1 | |
| | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | |||||
* | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -1/+13 | |
| | ||||||
* | Restrict top colliders / top scripts to estate managers | Melanie | 2010-09-27 | 1 | -0/+3 | |
| | ||||||
* | Consistency patch: use Path.Combine() instead of + and eliminate the need | Melanie | 2010-09-26 | 3 | -8/+9 | |
| | | | | for a trailing slash on exports/ |