Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-29 | 33 | -410/+1080 |
|\ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 16 | -227/+344 |
| |\ | |||||
| * | | Fix unit test. | Diva Canto | 2010-11-29 | 4 | -9/+22 |
| | | | |||||
| * | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 17 | -263/+390 |
| | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
| * | | Changed the parser for InventoryItem deserialization. Moved some utility ↵ | Diva Canto | 2010-11-27 | 3 | -121/+260 |
| | | | | | | | | | | | | functions around. | ||||
| * | | Creator information preserved upon HG transfers. | Diva Canto | 2010-11-26 | 5 | -9/+97 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-25 | 9 | -79/+373 |
| |\ \ | |||||
| * | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 16 | -58/+361 |
| | | | | | | | | | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | ||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-28 | 1 | -3/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix the build break | Melanie | 2010-11-29 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-28 | 1 | -6/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove the most spammy XML dumps from the FS voice module | Melanie | 2010-11-28 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-27 | 1 | -10/+76 |
|\ \ \ \ | |/ / / | |||||
| * | | | Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, ↵ | Marck | 2010-11-27 | 1 | -10/+76 |
| | | | | | | | | | | | | | | | | PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW | ||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-27 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Make gatekeeper's address check case-insensitive. | Marck | 2010-11-27 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -21/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Reformat an overzealous comment. Remove end of line marks and reference to the | Melanie | 2010-11-27 | 1 | -21/+24 |
| | | | | | | | | | | | | | | | | | | | | Mantis solved, as that isn't needed to understand the code. Reformat the comment for 80 col screens. | ||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -2/+27 |
|\ \ \ \ | |/ / / | |||||
| * | | | llUnsit position fix 4063 (updated 11-20-2010) | Micheil Merlin | 2010-11-27 | 1 | -2/+27 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -0/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | llVecNorm nant test | Micheil Merlin | 2010-11-27 | 1 | -0/+24 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 6 | -170/+149 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-27 | 1 | -15/+25 |
| |\ \ \ | |||||
| * | | | | Refactor appearance and avatar data sending code. Paritioning the routines ↵ | Mic Bowman | 2010-11-27 | 6 | -170/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes. | ||||
* | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -15/+25 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | If we fail to gather asset uuids for a particular asset, log the failing ↵ | Justin Clark-Casey (justincc) | 2010-11-27 | 1 | -15/+25 |
| |/ / / | | | | | | | | | | | | | asset id and type | ||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Another attempt at fixing failing test for creator info. | Marck | 2010-11-26 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 3 | -17/+18 |
|\ \ \ \ | |/ / / | |||||
| * | | | Trigger changed event with CHANGED_TELEPORT when teleporting to another region. | Marck | 2010-11-26 | 3 | -17/+18 |
| | | | | |||||
* | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -2/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix handling of landmarks for systems with culture settings other than ↵ | Marck | 2010-11-26 | 1 | -2/+10 |
| | |/ | |/| | | | | | | | en_US. This fixes Mantis #5177. | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Export the module interface for restart | Melanie | 2010-11-25 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 6 | -77/+62 |
|\ \ \ | |/ / | |||||
| * | | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 6 | -77/+62 |
| | | | |||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 1 | -2/+60 |
|\ \ \ | |/ / | |||||
| * | | Finish the RestartModule and fix some bugs. Add new console commands: | Melanie | 2010-11-25 | 1 | -2/+60 |
| | | | | | | | | | | | | | | | | | | region restart bluebox <msg> <time> ... region restart notice <msg> <time> ... region restart abort [<message>] | ||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 2 | -0/+243 |
|\ \ \ | |/ / | |||||
| * | | Implement the restart module | Melanie | 2010-11-25 | 2 | -3/+114 |
| | | | |||||
| * | | Adding the skeleton for the restart module | Melanie | 2010-11-24 | 2 | -0/+132 |
| | | | |||||
* | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 1 | -2/+9 |
|\ \ \ | |/ / | |||||
| * | | catch an exception when a mesh asset header cant be decoded | dahlia | 2010-11-24 | 1 | -2/+9 |
| |/ | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-23 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Attempt at fixing failing test. | Diva Canto | 2010-11-23 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-23 | 3 | -3/+13 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-23 | 11 | -83/+253 |
| |\ | |||||
| * | | Fix more potential nullrefs | Melanie | 2010-11-23 | 1 | -2/+4 |
| | | | |||||
| * | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 2 | -1/+9 |
| | | |