aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-08-068-20/+17
|\
| * goose pandaJustin Clark-Casey (justincc)2009-08-061-3/+1
| |
| * Disable all IAR tests for now due to possible failure-causing race conditionJustin Clark-Casey (justincc)2009-08-062-4/+3
| |
| * Merge branch 'master' of git://opensimulator.org/git/opensimSean Dague2009-08-0613-44/+292
| |\
| * | skip sqlite tests on z linux, as sqlite doesn't work right on the platformSean Dague2009-08-065-13/+13
| | |
* | | Add the addon modules folderMelanie2009-08-061-0/+1
| |/ |/|
* | Add the config-include statement to OpenSim.ini.example.Melanie2009-08-061-0/+8
| | | | | | | | addon-modules/*/config/*.ini is now included in the configuration
* | Allow arbitrary wildcards in config includes. Things likeMelanie2009-08-062-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 onwardsMelanie2009-08-061-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/opensimTeravus Ovares (Dan Olivares)2009-08-051-3/+0
|\ \
| * | Remove bad assembly identification tagMelanie2009-08-051-3/+0
| | |
* | | * Patch from jhurliman to add accept type recognition to determine the llsd ↵Teravus Ovares (Dan Olivares)2009-08-051-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 investigationJustin Clark-Casey (justincc)2009-08-051-1/+1
| |
* | test item data storage impementation (unused as of yet)Justin Clark-Casey (justincc)2009-08-051-14/+31
| |
* | hopefully the finally fix for the hooksSean Dague2009-08-051-4/+0
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimSean Dague2009-08-052-12/+13
|\ \
| * | Reinstate TestLoadIarV0_1ExistingUsers(), removing unnecessary waitJustin Clark-Casey (justincc)2009-08-052-12/+13
| | |
* | | fixing hooksSean Dague2009-08-051-0/+2
|/ /
* | test commit for new hook changesSean Dague2009-08-051-2/+0
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimSean Dague2009-08-051-1/+1
|\ \
| * | Fix prebuild include syntaxMelanie2009-08-051-1/+1
| | |
| * | Comment the include line as it seems our prebuild can't handle it.Melanie2009-08-051-1/+1
| | |
* | | test commit for triggering ciabot per changesetSean Dague2009-08-051-0/+2
|/ /
* | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-08-0525-13402/+14313
|\ \
| * | insert a little more debug info for TestReplicateArchivePathToUserInventory()Justin Clark-Casey (justincc)2009-08-051-1/+6
| | |
| * | Remove waiting in TestReplicateArchivePathToUserInventory() since local ↵Justin Clark-Casey (justincc)2009-08-052-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-051-6/+11
| | | | | | | | occasional test fail
| * reinstate TestSaveIarV0_1()Justin Clark-Casey (justincc)2009-08-051-1/+1
| |
| * remove some more mono compiler warningsJustin Clark-Casey2009-08-052-7/+7
| |
| * * Remove some mono compiler warningsJustin Clark-Casey2009-08-059-31/+28
| |
| * reinstate TestReplicateArchivePathToUserInventory()Justin Clark-Casey2009-08-051-1/+1
| |
| * force back the Regions directory, which because it was empty in svn never madeSean Dague2009-08-051-0/+0
| | | | | | | | the transition
| * * Fix OpenMetaverse.dll.configTeravus Ovares (Dan Olivares)2009-08-051-2/+4
| |
| * * Commit a slightly modified OpenMetaverse compiled as a .NET 2.0 targetTeravus Ovares (Dan Olivares)2009-08-0510-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 changeSean Dague2009-08-041-1/+1
| |
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey2009-08-041-12/+12
| |\
| | * trying to fix rare timer related exception.dr scofield (aka dirk husemann)2009-08-041-12/+12
| | |
| * | * Small commented out debug message for module loading, partly to test my ↵Justin Clark-Casey2009-08-041-0/+2
| |/ | | | | | | ability to commit with git
* | Add README to addon-modulesMelanie2009-08-051-0/+5
| |
* | Add include line to prebuildMelanie2009-08-051-0/+2
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into opensimdr scofield (aka dirk husemann)2009-08-040-0/+0
|\
| * adding aka for Dr Scofielddr scofield (aka dirk husemann)2009-08-041-1/+1
| |
* | adding aka for Dr Scofielddr scofield (aka dirk husemann)2009-08-041-1/+1
| |
* | Slight change to state management for attach scheduling.Alan Webb2009-08-043-13/+11
| | | | | | | | Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
* | This change adds support for the attach event in scripts.Alan Webb2009-08-045-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 extrusiondahlia2009-08-031-2/+18
|
* Revert the #3899 patch and it's two follow upsMelanie2009-08-043-49/+32
|
* Update a misspelled nameMelanie2009-08-042-2/+2
|
* Update config examplesMelanie2009-08-042-1/+2
|
* Configuration examples for the freeswitch moduleMelanie2009-08-042-1/+10
|