Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-17 | 4 | -100/+31 | |
|\ | ||||||
| * | Did I say that i don't like git? Remove some stuff that shouldn't have | Melanie | 2009-08-17 | 4 | -100/+31 | |
| | | | | | | | | gone in. | |||||
* | | Commented out one IAR test, because it's failing and needs attention from ↵ | Diva Canto | 2009-08-17 | 1 | -5/+7 | |
|/ | | | | justincc or arthursv. I think the mock inventory service needs a little bit more beef. | |||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-17 | 6 | -26/+71 | |
|\ | ||||||
| * | no-op to poke panda | Justin Clark-Casey (justincc) | 2009-08-17 | 1 | -4/+4 | |
| | | ||||||
| * | Apply http://opensimulator.org/mantis/view.php?id=3538 | Justin Clark-Casey (justincc) | 2009-08-17 | 2 | -4/+18 | |
| | | | | | | | | | | | | Add ability to silence IRC relay of region joins and quits from certain users This is useful for admins who wish to remain hidden, or service bots. Thanks RemedyTomm | |||||
| * | Added additional configuration options for MRM Security. See ↵ | Adam Frisby | 2009-08-18 | 1 | -8/+22 | |
| | | | | | | | | OpenSim.ini.example under the [MRM] section. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Adam Frisby | 2009-08-18 | 12 | -40/+158 | |
| |\ | ||||||
| * | | * Implementing a bunch of Unimplemented MRM stubs. | Adam Frisby | 2009-08-18 | 2 | -10/+27 | |
| | | | ||||||
* | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-17 | 15 | -42/+277 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add System.Xml reference to the console project | Melanie | 2009-08-17 | 5 | -32/+101 | |
| | | | ||||||
| * | | Add the ability to use -console=rest to the region server. User | Melanie | 2009-08-17 | 2 | -3/+26 | |
| | | | | | | | | | | | | and pass are specified the same way as for the ROBUST server | |||||
| * | | Add copyright headers. Formatting cleanup. Fix a compiler warning. | Jeff Ames | 2009-08-17 | 1 | -1/+0 | |
| | | | ||||||
| * | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-08-17 | 3 | -3/+30 | |
| | | | ||||||
| * | | Fix argument index in log4net call. (fixes #4003) | Jeff Ames | 2009-08-17 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Adam Frisby | 2009-08-17 | 4 | -2/+20 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-16 | 23 | -145/+362 | |
| | |\ | ||||||
| | * | | * ShortVersion, another attempt at fixing the test thread death that ↵ | Teravus Ovares (Dan Olivares) | 2009-08-16 | 3 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | * minor: comments | Teravus Ovares (Dan Olivares) | 2009-08-16 | 1 | -0/+16 | |
| | | | | ||||||
| * | | | * Implements AppDomain Security for MRM Scripts. | Adam Frisby | 2009-08-17 | 1 | -2/+101 | |
| | |/ | |/| | | | | | | | * 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. | |||||
* | | | IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld ↵ | Diva Canto | 2009-08-16 | 1 | -1/+3 | |
| | | | | | | | | | | | | UUID. | |||||
* | | | Removing the conditional for assetID=Zero upon rezzing attachments on login. | Diva Canto | 2009-08-16 | 1 | -5/+7 | |
| | | | ||||||
* | | | Removed some debug messages | Diva Canto | 2009-08-16 | 3 | -42/+7 | |
| | | | ||||||
* | | | Making attachments work again. Tons of debug more. This needs more testing ↵ | Diva Canto | 2009-08-16 | 6 | -66/+120 | |
| | | | | | | | | | | | | and a lot of cleaning. | |||||
* | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into ↵ | Diva Canto | 2009-08-16 | 22 | -135/+303 | |
|\ \ \ | |/ / | | | | | | | inventory-connector | |||||
| * | | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment | Adam Frisby | 2009-08-16 | 5 | -9/+17 | |
| | | | | | | | | | | | | * Disables 'event not used' warning for IRCClientView; cuts OpenSim total warnings back. | |||||
| * | | * Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of ↵ | Adam Frisby | 2009-08-16 | 2 | -13/+15 | |
| | | | | | | | | | | | | IAvatar.cs | |||||
| * | | * Implements ISecurityCredential on all uses of SOPObject.cs except Avatar ↵ | Adam Frisby | 2009-08-16 | 2 | -2/+2 | |
| | | | | | | | | | | | | Attachments. | |||||
| * | | * [MRM] Added permission checks to MRM Events (ie, requires edit permission ↵ | Adam Frisby | 2009-08-16 | 1 | -6/+9 | |
| | | | | | | | | | | | | to bind to OnTouch) | |||||
| * | | * Fixes potential NulRef in MRM Security Checks. | Adam Frisby | 2009-08-16 | 2 | -3/+4 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Adam Frisby | 2009-08-16 | 15 | -94/+165 | |
| |\ \ | ||||||
| | * | | Add copyright headers. Formatting cleanup. | Jeff Ames | 2009-08-16 | 2 | -1/+55 | |
| | | | | ||||||
| | * | | Misc cleanup. | Jeff Ames | 2009-08-16 | 7 | -93/+58 | |
| | | | | ||||||
| | * | | Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ↵ | Adam Johnson | 2009-08-16 | 6 | -0/+52 | |
| | | | | | | | | | | | | | | | | Handler - ref mantis #4010 | |||||
| * | | | * [MRM] Implements permission checks on IObject implementations in ↵ | Adam Frisby | 2009-08-16 | 3 | -9/+92 | |
| |/ / | | | | | | | | | | SOPObject.cs. Does not implement security on IObjectInventory yet. | |||||
* | | | Merge branch 'master' into inventory-connector | Diva Canto | 2009-08-15 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Changed one word in a comment | Diva Canto | 2009-08-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' of ../opensim-diva/ into inventory-connector | Melanie | 2009-08-15 | 25 | -1332/+863 | |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | ||||||
| * | | Changed FromAssetID to FromItemID | Diva Canto | 2009-08-15 | 6 | -25/+25 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-15 | 4 | -28/+334 | |
| |\ \ | | |/ | ||||||
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-14 | 6 | -61/+55 | |
| |\ \ | ||||||
| * | | | Returning UUID.Zero is scene and user profile service are null in ↵ | Diva Canto | 2009-08-14 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | GetSession. This doesn't fix the underlying problem of these things being null -- they shouldn't be. | |||||
| * | | | Changed the way to get to the profile service. Changed GetSystemsFolder in ↵ | Diva Canto | 2009-08-14 | 2 | -5/+19 | |
| | | | | | | | | | | | | | | | | HGBroker. | |||||
| * | | | More debug messages. | Diva Canto | 2009-08-14 | 1 | -0/+7 | |
| | | | | ||||||
| * | | | Doing session lookup in the right way. | Diva Canto | 2009-08-14 | 2 | -8/+11 | |
| | | | | ||||||
| * | | | Additional debug messages, and bug fix in ↵ | Diva Canto | 2009-08-14 | 2 | -2/+12 | |
| | | | | | | | | | | | | | | | | RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set. | |||||
| * | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| * | | | | Added GetAssetPermissions. Few last bugs nixed. This is ready for testing. | Diva Canto | 2009-08-13 | 6 | -28/+49 | |
| | | | | | ||||||
| * | | | | Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' ↵ | Diva Canto | 2009-08-13 | 13 | -49/+49 | |
| | | | | | | | | | | | | | | | | | | | | starting to get on my nerves. | |||||
| * | | | | Inventory redirects from CachedUserInfo to InventoryService COMPLETE! | Diva Canto | 2009-08-13 | 10 | -390/+146 | |
| | | | | |