Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-08-06 | 8 | -20/+17 |
|\ | |||||
| * | goose panda | Justin Clark-Casey (justincc) | 2009-08-06 | 1 | -3/+1 |
| | | |||||
| * | Disable all IAR tests for now due to possible failure-causing race condition | Justin Clark-Casey (justincc) | 2009-08-06 | 2 | -4/+3 |
| | | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Sean Dague | 2009-08-06 | 13 | -44/+292 |
| |\ | |||||
| * | | skip sqlite tests on z linux, as sqlite doesn't work right on the platform | Sean Dague | 2009-08-06 | 5 | -13/+13 |
| | | | |||||
* | | | Add the addon modules folder | Melanie | 2009-08-06 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Add the config-include statement to OpenSim.ini.example. | Melanie | 2009-08-06 | 1 | -0/+8 |
| | | | | | | | | addon-modules/*/config/*.ini is now included in the configuration | ||||
* | | Allow arbitrary wildcards in config includes. Things like | Melanie | 2009-08-06 | 2 | -3/+55 |
| | | | | | | | | | | Include-Modules = "addin-modules/*/config/*.ini" will now work. Adds Util.Glob, which will resolve a globbed path into a string list. | ||||
* | | Complete the work on the Replaceable interface logic. From this commit onwards | Melanie | 2009-08-06 | 1 | -1/+102 |
| | | | | | | | | | | the mere presence of a full version of a replaceable module will cause the replaceable module in core to be deactivated. | ||||
* | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-05 | 1 | -3/+0 |
|\ \ | |||||
| * | | Remove bad assembly identification tag | Melanie | 2009-08-05 | 1 | -3/+0 |
| | | | |||||
* | | | * Patch from jhurliman to add accept type recognition to determine the llsd ↵ | Teravus Ovares (Dan Olivares) | 2009-08-05 | 1 | -7/+67 |
|/ / | | | | | | | | | | | content format. *should allow both json and xml serializations of llsd to work properly. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
* | | Disable TestReplicateArchivePathToUserInventory() pending more investigation | Justin Clark-Casey (justincc) | 2009-08-05 | 1 | -1/+1 |
| | | |||||
* | | test item data storage impementation (unused as of yet) | Justin Clark-Casey (justincc) | 2009-08-05 | 1 | -14/+31 |
| | | |||||
* | | hopefully the finally fix for the hooks | Sean Dague | 2009-08-05 | 1 | -4/+0 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Sean Dague | 2009-08-05 | 2 | -12/+13 |
|\ \ | |||||
| * | | Reinstate TestLoadIarV0_1ExistingUsers(), removing unnecessary wait | Justin Clark-Casey (justincc) | 2009-08-05 | 2 | -12/+13 |
| | | | |||||
* | | | fixing hooks | Sean Dague | 2009-08-05 | 1 | -0/+2 |
|/ / | |||||
* | | test commit for new hook changes | Sean Dague | 2009-08-05 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Sean Dague | 2009-08-05 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix prebuild include syntax | Melanie | 2009-08-05 | 1 | -1/+1 |
| | | | |||||
| * | | Comment the include line as it seems our prebuild can't handle it. | Melanie | 2009-08-05 | 1 | -1/+1 |
| | | | |||||
* | | | test commit for triggering ciabot per changeset | Sean Dague | 2009-08-05 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-08-05 | 25 | -13402/+14313 |
|\ \ | |||||
| * | | insert a little more debug info for TestReplicateArchivePathToUserInventory() | Justin Clark-Casey (justincc) | 2009-08-05 | 1 | -1/+6 |
| | | | |||||
| * | | Remove waiting in TestReplicateArchivePathToUserInventory() since local ↵ | Justin Clark-Casey (justincc) | 2009-08-05 | 2 | -3/+5 |
| |/ | | | | | | | | | | | inventory loading is synchronous Insert a little more debugging info in case the occasional failure reoccurs | ||||
| * | Recomment TestReplicateArchivePathToUserInventory() for now due to ↵ | Justin Clark-Casey (justincc) | 2009-08-05 | 1 | -6/+11 |
| | | | | | | | | occasional test fail | ||||
| * | reinstate TestSaveIarV0_1() | Justin Clark-Casey (justincc) | 2009-08-05 | 1 | -1/+1 |
| | | |||||
| * | remove some more mono compiler warnings | Justin Clark-Casey | 2009-08-05 | 2 | -7/+7 |
| | | |||||
| * | * Remove some mono compiler warnings | Justin Clark-Casey | 2009-08-05 | 9 | -31/+28 |
| | | |||||
| * | reinstate TestReplicateArchivePathToUserInventory() | Justin Clark-Casey | 2009-08-05 | 1 | -1/+1 |
| | | |||||
| * | force back the Regions directory, which because it was empty in svn never made | Sean Dague | 2009-08-05 | 1 | -0/+0 |
| | | | | | | | | the transition | ||||
| * | * Fix OpenMetaverse.dll.config | Teravus Ovares (Dan Olivares) | 2009-08-05 | 1 | -2/+4 |
| | | |||||
| * | * Commit a slightly modified OpenMetaverse compiled as a .NET 2.0 target | Teravus Ovares (Dan Olivares) | 2009-08-05 | 10 | -13345/+14243 |
| | | | | | | | | | | | | | | | | * Hopefully this allows older mono versions to still work. * A couple of points of note: * TimeZoneInfo.. replaced with DateTime.UtcNow - TimeSpan.FromHours(7); * HashSet<uint> replaced with Dictionary<uint,object> * Force use of the managed version of ReaderWriterLockSlim (don't use the pre-processor defs) | ||||
| * | minor format change | Sean Dague | 2009-08-04 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey | 2009-08-04 | 1 | -12/+12 |
| |\ | |||||
| | * | trying to fix rare timer related exception. | dr scofield (aka dirk husemann) | 2009-08-04 | 1 | -12/+12 |
| | | | |||||
| * | | * Small commented out debug message for module loading, partly to test my ↵ | Justin Clark-Casey | 2009-08-04 | 1 | -0/+2 |
| |/ | | | | | | | ability to commit with git | ||||
* | | Add README to addon-modules | Melanie | 2009-08-05 | 1 | -0/+5 |
| | | |||||
* | | Add include line to prebuild | Melanie | 2009-08-05 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into opensim | dr scofield (aka dirk husemann) | 2009-08-04 | 0 | -0/+0 |
|\ | |||||
| * | adding aka for Dr Scofield | dr scofield (aka dirk husemann) | 2009-08-04 | 1 | -1/+1 |
| | | |||||
* | | adding aka for Dr Scofield | dr scofield (aka dirk husemann) | 2009-08-04 | 1 | -1/+1 |
| | | |||||
* | | Slight change to state management for attach scheduling. | Alan Webb | 2009-08-04 | 3 | -13/+11 |
| | | | | | | | | Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | ||||
* | | This change adds support for the attach event in scripts. | Alan Webb | 2009-08-04 | 5 | -0/+41 |
|/ | | | | | | | | | | | | | | | | | | | [1] Added a new OnAttach event to Scene/EventManager [2] Hooked up existing attach event handler in XEngine. [3] Modified SceneGraph and Scene.Inventory to trigger attach events at the appropriate places. I was forced to distribut the changes across two files because of the way attach processing is distributed across the two files. [4] In the case of RezSingleAttachmentFromInventory it is necessary to handle event scheduling in a special way. There is no synchronous path available, so the fact that this object is attached, and who it is attached to, is cached when the ScriptInstance is created. When the script is started, the attached handler is driven after on_rez (but before changed, this should be reviewed). Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | ||||
* | starting to refactor path generation out of prim extrusion | dahlia | 2009-08-03 | 1 | -2/+18 |
| | |||||
* | Revert the #3899 patch and it's two follow ups | Melanie | 2009-08-04 | 3 | -49/+32 |
| | |||||
* | Update a misspelled name | Melanie | 2009-08-04 | 2 | -2/+2 |
| | |||||
* | Update config examples | Melanie | 2009-08-04 | 2 | -1/+2 |
| | |||||
* | Configuration examples for the freeswitch module | Melanie | 2009-08-04 | 2 | -1/+10 |
| |