Jeff Ames
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00
Jeff Ames
ad02aefaee
Fix argument index in log4net call. ( fixes #4003 )
2009-08-17 01:46:00 +09:00
Adam Frisby
e5b94346b6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-17 02:25:24 +10:00
Adam Frisby
fa921ec147
* Implements AppDomain Security for MRM Scripts.
...
* Added permissionLevel attribute to [MRM] section in OpenSim.ini. Default is 'Internet', however may be any of the following (case sensitive), FullTrust, SkipVerification, Execution, Nothing, LocalIntranet, Internet, Everything. For previous functionality, set to FullTrust or Execution.
2009-08-17 02:25:00 +10:00
Teravus Ovares (Dan Olivares)
acc14c472d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-16 12:15:14 -04:00
Teravus Ovares (Dan Olivares)
5e391b9f7c
* ShortVersion, another attempt at fixing the test thread death that randomly occurs.
...
* LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.
2009-08-16 12:14:49 -04:00
Teravus Ovares (Dan Olivares)
4eeab4097a
* minor: comments
2009-08-16 12:10:06 -04:00
Diva Canto
6808b9109e
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
2009-08-16 08:59:58 -07:00
Adam Frisby
cbd454d692
* Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment
...
* Disables 'event not used' warning for IRCClientView; cuts OpenSim total warnings back.
2009-08-16 22:01:18 +10:00
Adam Frisby
c2be3edd2d
* Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of IAvatar.cs
2009-08-16 21:49:53 +10:00
Adam Frisby
b28e826541
* Implements ISecurityCredential on all uses of SOPObject.cs except Avatar Attachments.
2009-08-16 21:41:57 +10:00
Adam Frisby
adae13cd18
* [MRM] Added permission checks to MRM Events (ie, requires edit permission to bind to OnTouch)
2009-08-16 21:36:33 +10:00
Adam Frisby
8621dc405e
* Fixes potential NulRef in MRM Security Checks.
2009-08-16 21:23:39 +10:00
Adam Frisby
aea4d7c63b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 21:21:38 +10:00
Adam Frisby
975c49a399
* [MRM] Implements permission checks on IObject implementations in SOPObject.cs. Does not implement security on IObjectInventory yet.
2009-08-16 21:20:45 +10:00
Jeff Ames
2b630470b0
Add copyright headers. Formatting cleanup.
2009-08-16 17:30:13 +09:00
Jeff Ames
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
Adam Johnson
a42569d896
Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet Handler - ref mantis #4010
2009-08-16 15:06:06 +09:00
Diva Canto
e18a091968
Merge branch 'master' into inventory-connector
2009-08-15 15:45:56 -07:00
Diva Canto
9d4ed3b018
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-15 15:45:25 -07:00
Diva Canto
710a15845c
Merge branch 'master' into inventory-connector
2009-08-15 15:08:04 -07:00
Diva Canto
19e45466f2
Changed one word in a comment
2009-08-15 14:57:24 -07:00
Melanie
973be65945
Merge branch 'master' of ../opensim-diva/ into inventory-connector
2009-08-15 19:00:56 +01:00
Adam Frisby
8b6d79aa3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-16 03:50:12 +10:00
Adam Frisby
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
Diva Canto
1bbf06405c
Changed FromAssetID to FromItemID
2009-08-15 09:36:45 -07:00
Diva Canto
dd8b9d5810
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-15 08:21:15 -07:00
Teravus Ovares (Dan Olivares)
ddac88da6a
* whoops, missing a /
2009-08-15 00:29:34 -04:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
95be3eccd2
* minor: comments
...
* also re-trigger panda
2009-08-15 00:01:58 -04:00
Teravus Ovares (Dan Olivares)
f208628667
* minor : Comments
...
* Also re-trigger Panda.
2009-08-14 21:37:25 -04:00
Teravus Ovares (Dan Olivares)
2f61fb0243
* minor : comments
...
* also re-trigger panda
2009-08-14 21:19:04 -04:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
2c20d60de6
* Added Kunnis to CONTRIBUTORS.txt
2009-08-14 17:59:57 -04:00
Diva Canto
f00a717fa2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:54:29 -07:00
Teravus Ovares (Dan Olivares)
8727e773d4
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 17:53:21 -04:00
Teravus Ovares (Dan Olivares)
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
Diva Canto
cd444c1e82
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-08-14 14:04:15 -07:00
Justin Clark-Casey (justincc)
e17a2331a0
* Re-enable TestLoadIarV0_1ExistingUsers()
2009-08-14 20:38:56 +01:00
Justin Clark-Casey (justincc)
ff28ecee1b
Re-enable TestSaveIarV0_1()
...
Implement more parts of TestAssetService
2009-08-14 20:07:13 +01:00
Justin Clark-Casey (justincc)
3e94eecc5c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-08-14 20:00:24 +01:00
Justin Clark-Casey (justincc)
a668a5b0d3
Add standard doc and standard doc formatting to IAssetService
2009-08-14 19:59:42 +01:00
Diva Canto
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
Diva Canto
bb513c1d88
Changed the way to get to the profile service. Changed GetSystemsFolder in HGBroker.
2009-08-14 11:32:25 -07:00
Teravus Ovares (Dan Olivares)
7554641703
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-14 14:16:02 -04:00
Teravus Ovares (Dan Olivares)
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
Justin Clark-Casey (justincc)
957962b482
Remove NRE catching on TestReplicateArchivePathToUserInventory() since race failure now appears to have gone
2009-08-14 19:06:24 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
31820b0026
minor formatting adjustments
2009-08-14 18:36:09 +01:00
Diva Canto
c56e51a6e3
More debug messages.
2009-08-14 10:29:29 -07:00