973be65945
Merge branch 'master' of ../opensim-diva/ into inventory-connector
2009-08-15 19:00:56 +01:00
8b6d79aa3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 03:50:12 +10:00
9090a90769
* Beginnings of a Security Credential system in MRM. This will eventually lead to trusted execution of untrusted MRMs.
2009-08-16 03:48:16 +10:00
30ce56e721
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-15 13:10:21 -04:00
8000812700
* part one of adding physics combining
2009-08-15 13:10:10 -04:00
1bbf06405c
Changed FromAssetID to FromItemID
2009-08-15 09:36:45 -07:00
dd8b9d5810
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-15 08:21:15 -07:00
ddac88da6a
* whoops, missing a /
2009-08-15 00:29:34 -04:00
72c2819c53
* Comment out XEngineTest that doesn't appear to test anything. It just creates a scene named 'My Test' which just happens to be the last scene displayed in the nunit log before it goes boom.
2009-08-15 00:22:18 -04:00
95be3eccd2
* minor: comments
...
* also re-trigger panda
2009-08-15 00:01:58 -04:00
f208628667
* minor : Comments
...
* Also re-trigger Panda.
2009-08-14 21:37:25 -04:00
2f61fb0243
* minor : comments
...
* also re-trigger panda
2009-08-14 21:19:04 -04:00
1b933c9116
* Put the StandaloneTeleportTest in a new thread and call Thread.Join() inside a try/Catch (ThreadAbortException) to try and get around scene code aborting the testing thread. Use a Messenger class to report the results back to the test thread.
2009-08-14 19:12:42 -04:00
2c20d60de6
* Added Kunnis to CONTRIBUTORS.txt
2009-08-14 17:59:57 -04:00
f00a717fa2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:54:29 -07:00
8727e773d4
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 17:53:21 -04:00
386aa470ea
* Kunnis' third patch in mantis: http://opensimulator.org/mantis/view.php?id=3993
...
* Sets the assembly target of all projects to .NET 3.5. I was asked to apply this by Diva to resolve a build issue with LinQ on Visual Studio 2008 but I have not tested it personally.
2009-08-14 17:52:57 -04:00
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
e17a2331a0
* Re-enable TestLoadIarV0_1ExistingUsers()
2009-08-14 20:38:56 +01:00
ff28ecee1b
Re-enable TestSaveIarV0_1()
...
Implement more parts of TestAssetService
2009-08-14 20:07:13 +01:00
3e94eecc5c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-14 20:00:24 +01:00
a668a5b0d3
Add standard doc and standard doc formatting to IAssetService
2009-08-14 19:59:42 +01:00
46116864b9
Returning UUID.Zero is scene and user profile service are null in GetSession. This doesn't fix the underlying problem of these things being null -- they shouldn't be.
2009-08-14 11:50:42 -07:00
bb513c1d88
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
2009-08-14 11:32:25 -07:00
7554641703
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 14:16:02 -04:00
dce81225c5
* allocate the dictionary for AgentCircuitData.ChildrenCapSeeds when creating the circuitdata object to see if it's the cause of a null reference exception in the TestAddNeighbourRegio test
2009-08-14 14:15:49 -04:00
957962b482
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
2009-08-14 19:06:24 +01:00
b02f12da78
Return minimum mono version in README to 2.0.1 for now (recommended is still 2.4.2)
2009-08-14 18:57:18 +01:00
31820b0026
minor formatting adjustments
2009-08-14 18:36:09 +01:00
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07:00
c18f7560d9
Adding in Reflection-based testing, to ensure that all properties are covered.
2009-08-14 18:15:25 +01:00
70d7c97e94
Doing session lookup in the right way.
2009-08-14 09:57:18 -07:00
332d1b5f2f
Additional debug messages, and bug fix in RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set.
2009-08-14 08:43:46 -07:00
a851b68333
Remove one more sponsor reference
2009-08-14 14:27:56 +01:00
7a2a2e68e7
Remove the script sponsor logic because scripts are timing out again.
...
This needs to be looked into. This commit, unfortunately, reinstates
a memory leak in regions that see significant script fluctuation,
e.g. lots of scripted attachments, or script development.
2009-08-14 14:18:56 +01:00
6ece8d86e0
Deal with possible race in TestAddNeighborRegion in ScenePresenceTests
2009-08-13 23:06:29 -04:00
02f55ff9bd
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 22:12:57 -04:00
0781ac9a5e
* Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing a thread, a dead thread, and a null Thread
...
* Fix a null thread situation
2009-08-13 22:12:37 -04:00
21b5ebdc1f
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 19:11:38 -07:00
7a761560c6
* Add AgentCircuitManager tests for adding, removing, changing circuit code, and authentication.
2009-08-13 21:01:39 -04:00
ded76723eb
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 17:45:17 -07:00
73b0cf492d
Add some extra info to script load messages
2009-08-14 01:35:14 +01:00
034c9cf606
Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.
2009-08-13 17:34:15 -07:00
f5fc5226f8
* Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test.
2009-08-13 18:10:09 -04:00
5246dc33dc
Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves.
2009-08-13 14:10:12 -07:00
6b9cc6c48d
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
2009-08-13 11:30:29 -07:00
9bcca3dc95
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-13 12:39:46 -04:00
5b325f1f54
* minor: comments
2009-08-13 12:39:33 -04:00
6a0f7c2275
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-13 06:31:24 -07:00
3669115d60
Some small fixes
2009-08-13 13:25:33 +01:00
Melanie