72e597bcba
Merge branch 'master' into groups-core-contrib
2009-08-06 11:22:10 -07:00
4078a331e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2009-08-06 14:03:16 -04:00
b0e6d0fc01
skip sqlite tests on z linux, as sqlite doesn't work right on the platform
2009-08-06 14:01:36 -04:00
2ac04cb624
Merge branch 'master' into groups-core-contrib
2009-08-06 09:38:51 -07:00
6244b8c384
Fixing comments re: INI file.
2009-08-06 09:34:30 -07:00
00aceec799
Add the config-include statement to OpenSim.ini.example.
...
addon-modules/*/config/*.ini is now included in the configuration
2009-08-06 02:33:44 +01:00
efc57bc3d7
Allow arbitrary wildcards in config includes. Things like
...
Include-Modules = "addin-modules/*/config/*.ini" will now work.
Adds Util.Glob, which will resolve a globbed path into a string list.
2009-08-06 02:29:12 +01:00
c73ee1d06e
Complete the work on the Replaceable interface logic. From this commit onwards
...
the mere presence of a full version of a replaceable module will cause the
replaceable module in core to be deactivated.
2009-08-06 01:10:45 +01:00
c73a6ab7e0
Continue with renaming of Groups module components
2009-08-05 14:56:48 -07:00
72b6e7f949
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-05 17:38:27 -04:00
535cb0efc1
* Patch from jhurliman to add accept type recognition to determine the llsd content format. *should allow both json and xml serializations of llsd to work properly.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-08-05 16:47:48 -04:00
6c65b990a2
Fixes mono Add-In references for the OptionalModules add-in so that groups doesn't throw errors, and so that the add-in is correctly reported as "OptionalModules" rather then as "SampleMoney"
2009-08-05 13:20:46 -07:00
e8b0f7cf5d
Remove bad assembly identification tag
2009-08-05 20:37:10 +01:00
bc6de6f5f0
Disable TestReplicateArchivePathToUserInventory() pending more investigation
2009-08-05 20:05:22 +01:00
1f7466e5c3
test item data storage impementation (unused as of yet)
2009-08-05 20:04:27 +01:00
eeb7fda62a
hopefully the finally fix for the hooks
2009-08-05 14:46:30 -04:00
8f4048c63a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-05 14:44:25 -04:00
9a5e78a4c9
fixing hooks
2009-08-05 14:44:16 -04:00
07e00e110d
Reinstate TestLoadIarV0_1ExistingUsers(), removing unnecessary wait
2009-08-05 19:38:45 +01:00
456b383cc4
test commit for new hook changes
2009-08-05 14:37:58 -04:00
a8a77c07ad
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-05 14:37:16 -04:00
1df2c6d8ee
test commit for triggering ciabot per changeset
2009-08-05 14:36:41 -04:00
989517725d
Begin refactoring XmlRpcGroups to a more generic Groups module that allows for replaceable Groups Service Connectors.
2009-08-05 11:15:53 -07:00
dcbaaba61f
Fix prebuild include syntax
2009-08-05 18:55:37 +01:00
d2c7fd223c
Comment the include line as it seems our prebuild can't handle it.
2009-08-05 18:48:43 +01:00
b1e7e03390
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-08-05 18:38:42 +01:00
9e5736eeec
insert a little more debug info for TestReplicateArchivePathToUserInventory()
2009-08-05 19:06:07 +01:00
f8d8f07cb4
Remove waiting in TestReplicateArchivePathToUserInventory() since local inventory loading is synchronous
...
Insert a little more debugging info in case the occasional failure reoccurs
2009-08-05 18:59:44 +01:00
8e58f44040
Add README to addon-modules
2009-08-05 18:36:36 +01:00
3cfd6f0c1a
Add include line to prebuild
2009-08-05 18:34:31 +01:00
1b65bd5861
Recomment TestReplicateArchivePathToUserInventory() for now due to occasional test fail
2009-08-05 18:21:22 +01:00
9e0f1b7fef
reinstate TestSaveIarV0_1()
2009-08-05 18:01:18 +01:00
e5904c3883
remove some more mono compiler warnings
2009-08-05 17:39:32 +01:00
190bdc8a2e
* Remove some mono compiler warnings
2009-08-05 17:33:23 +01:00
3323413f53
reinstate TestReplicateArchivePathToUserInventory()
2009-08-05 17:17:20 +01:00
8cd9e59535
force back the Regions directory, which because it was empty in svn never made
...
the transition
2009-08-05 10:40:59 -04:00
b8f53990fa
* Fix OpenMetaverse.dll.config
2009-08-05 03:23:51 -04:00
31b6073149
* Commit a slightly modified OpenMetaverse compiled as a .NET 2.0 target
...
* 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)
2009-08-05 02:42:52 -04:00
2c2406346e
minor format change
2009-08-04 15:55:48 -04:00
bfc705766b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-04 19:01:01 +01:00
7f5a4bbc26
* Small commented out debug message for module loading, partly to test my ability to commit with git
2009-08-04 19:00:20 +01:00
4ffc284a36
trying to fix rare timer related exception.
2009-08-04 17:24:32 +02:00
9f5b0c1fd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into opensim
2009-08-04 12:11:24 +02:00
8bfb85080d
adding aka for Dr Scofield
2009-08-04 12:10:36 +02:00
51b3e5741c
adding aka for Dr Scofield
2009-08-04 12:05:49 +02:00
068f54725b
Slight change to state management for attach scheduling.
...
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-08-04 11:44:22 +02:00
9ffe4d850e
This change adds support for the attach event in scripts.
...
[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>
2009-08-04 11:41:06 +02:00
21e62e87c7
starting to refactor path generation out of prim extrusion
2009-08-03 22:59:47 -07:00
c3dd98b016
Revert the #3899 patch and it's two follow ups
2009-08-04 05:03:32 +01:00
1d8df738f6
Update a misspelled name
2009-08-04 04:57:08 +01:00
Michael Cortez