Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 79 | -1150/+2402 |
|\ | |||||
| * | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 1 | -19/+6 |
| |\ | |||||
| | * | Simplify updating of agent inventory assets. Make newly created asset IDs | Melanie | 2010-12-04 | 1 | -19/+6 |
| | | | | | | | | | | | | random rather than using IDs known by the client ahead of time. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 4 | -170/+158 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-04 | 5 | -57/+235 |
| | |\ | |||||
| | * | | Convert the agent asset transactions module to a new style module. | Melanie | 2010-12-04 | 4 | -170/+158 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to remove the property "MyScene" and the pointless circular refs to the managing classes. Converted the module to a non-shared module. Reformatted source for 80 columns. Removed the special role the module had in the old loader. | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 2 | -0/+93 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | minor: add class doc line to older region module example code pointing ↵ | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | towards newer | ||||
| | * | | comment out the extension attribute | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | add bare bones shared example module | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+91 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 2 | -61/+54 |
| |\ \ \ | | |/ / | |||||
| | * | | refactor some common code in RegionModulesControllerPlugin | Justin Clark-Casey (justincc) | 2010-12-04 | 2 | -61/+54 |
| | | | | | | | | | | | | | | | | also some minor doc changes in BareBonesNonSharedModule | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 1 | -0/+83 |
| |\ \ \ | | |/ / | |||||
| | * | | correct the id of the example module | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add the most bare bones non-shared region module example. Not active unless ↵ | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+83 |
| | | | | | | | | | | | | | | | | the correct line is uncommented. | ||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 2 | -2/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | add warning decals and information to RegionModule.cs in probably ↵ | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | non-functional OpenSim.Region.Examples.SimpleModule project | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-12-04 | 4 | -62/+123 |
| | |\ \ | | | |/ | |||||
| | * | | minor: correction to logging category | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 4 | -62/+123 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Various bug fixes for appearance handling: more aggressive reset of textures ↵ | Mic Bowman | 2010-12-03 | 4 | -62/+123 |
| | |/ | | | | | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging. | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | minor: change OpenSimBase log messages associated with newer module loader ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -2/+2 |
| | | | | | | | | | | | | to make the association clear | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-02 | 4 | -8/+28 |
| |\ \ | | |/ | |||||
| | * | Only force prim persistence before delete if the prim is the result of an ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 4 | -8/+28 |
| | | | | | | | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets | ||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-01 | 3 | -19/+50 |
| |\ \ | | |/ | |||||
| | * | Stop LLUDPServer sending updates after object deletes by always queueing deletes | Justin Clark-Casey (justincc) | 2010-12-02 | 3 | -19/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately. Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates. In tests, this doesn't appear to affect performance. There is probably still an issue present where an update packet might not be acked and then resent after the kill packet. | ||||
| | * | minor: add some method doc | Justin Clark-Casey (justincc) | 2010-12-02 | 2 | -0/+22 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-01 | 5 | -121/+0 |
| |\ \ | | |/ | |||||
| | * | Deleted obsolete config files from old OpenSim.Grid. | Diva Canto | 2010-12-01 | 5 | -121/+0 |
| | | | |||||
| * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-01 | 4 | -1/+28 |
| |\ \ | | |/ | |||||
| | * | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 4 | -1/+28 |
| | | | |||||
| * | | 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. |