Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into ↵ | Diva Canto | 2009-08-16 | 32 | -201/+427 |
|\ | | | | | | | 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 | 25 | -160/+289 |
| |\ | |||||
| | * | Add copyright headers. Formatting cleanup. | Jeff Ames | 2009-08-16 | 4 | -4/+112 |
| | | | |||||
| | * | Misc cleanup. | Jeff Ames | 2009-08-16 | 11 | -156/+119 |
| | | | |||||
| | * | Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ↵ | Adam Johnson | 2009-08-16 | 10 | -0/+58 |
| | | | | | | | | | | | | 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 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-15 | 6 | -13/+62 |
| |\ \ | | |/ | |||||
* | | | 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 | 37 | -1370/+1013 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | 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 | 5 | -29/+337 |
| |\ | |||||
| * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-14 | 1 | -112/+113 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-14 | 14 | -88/+730 |
| |\ \ \ | |||||
| * | | | | 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 | 2 | -2/+203 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 3 | -1/+465 |
| |\ \ \ \ \ | |||||
| * | | | | | | Added GetAssetPermissions. Few last bugs nixed. This is ready for testing. | Diva Canto | 2009-08-13 | 15 | -44/+168 |
| | | | | | | | |||||
| * | | | | | | Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' ↵ | Diva Canto | 2009-08-13 | 21 | -70/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting to get on my nerves. | ||||
| * | | | | | | Inventory redirects from CachedUserInfo to InventoryService COMPLETE! | Diva Canto | 2009-08-13 | 10 | -390/+146 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 6 | -36/+74 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-12 | 19 | -13/+484 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Redirected all calls to CachedUserProfile methods to the inventory service. ↵ | Diva Canto | 2009-08-12 | 11 | -859/+580 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirection of the RootFolder property is still todo. This compiles but probably inventory will be inconsistent. | ||||
* | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Adam Frisby | 2009-08-16 | 18 | -217/+940 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | * whoops, missing a / | Teravus Ovares (Dan Olivares) | 2009-08-15 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | * Comment out XEngineTest that doesn't appear to test anything. It just ↵ | Teravus Ovares (Dan Olivares) | 2009-08-15 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creates a scene named 'My Test' which just happens to be the last scene displayed in the nunit log before it goes boom. | ||||
| * | | | | | | | | * minor: comments | Teravus Ovares (Dan Olivares) | 2009-08-15 | 1 | -2/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also re-trigger panda | ||||
| * | | | | | | | | * minor : Comments | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -3/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also re-trigger Panda. | ||||
| * | | | | | | | | * minor : comments | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -3/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also re-trigger panda | ||||
| * | | | | | | | | * Put the StandaloneTeleportTest in a new thread and call Thread.Join() ↵ | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -20/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | | | * Added Kunnis to CONTRIBUTORS.txt | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -1/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-14 | 3 | -26/+53 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | * Re-enable TestLoadIarV0_1ExistingUsers() | Justin Clark-Casey (justincc) | 2009-08-14 | 1 | -12/+3 |
| | | | | | | | | |||||
| | * | | | | | | Re-enable TestSaveIarV0_1() | Justin Clark-Casey (justincc) | 2009-08-14 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement more parts of TestAssetService | ||||
| | * | | | | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-08-14 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Add standard doc and standard doc formatting to IAssetService | Justin Clark-Casey (justincc) | 2009-08-14 | 2 | -10/+38 |
| | | | | | | | | | |||||
| * | | | | | | | | * Kunnis' third patch in mantis: ↵ | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -112/+113 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-14 | 9 | -50/+436 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Remove NRE catching on TestReplicateArchivePathToUserInventory() since race ↵ | Justin Clark-Casey (justincc) | 2009-08-14 | 1 | -27/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure now appears to have gone | ||||
| | * | | | | | | Return minimum mono version in README to 2.0.1 for now (recommended is still ↵ | Justin Clark-Casey (justincc) | 2009-08-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.4.2) |