aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into ↵Diva Canto2009-08-1632-201/+427
|\ | | | | | | inventory-connector
| * * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachmentAdam Frisby2009-08-165-9/+17
| | | | | | | | * Disables 'event not used' warning for IRCClientView; cuts OpenSim total warnings back.
| * * Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of ↵Adam Frisby2009-08-162-13/+15
| | | | | | | | IAvatar.cs
| * * Implements ISecurityCredential on all uses of SOPObject.cs except Avatar ↵Adam Frisby2009-08-162-2/+2
| | | | | | | | Attachments.
| * * [MRM] Added permission checks to MRM Events (ie, requires edit permission ↵Adam Frisby2009-08-161-6/+9
| | | | | | | | to bind to OnTouch)
| * * Fixes potential NulRef in MRM Security Checks.Adam Frisby2009-08-162-3/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-1625-160/+289
| |\
| | * Add copyright headers. Formatting cleanup.Jeff Ames2009-08-164-4/+112
| | |
| | * Misc cleanup.Jeff Ames2009-08-1611-156/+119
| | |
| | * Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ↵Adam Johnson2009-08-1610-0/+58
| | | | | | | | | | | | Handler - ref mantis #4010
| * | * [MRM] Implements permission checks on IObject implementations in ↵Adam Frisby2009-08-163-9/+92
| |/ | | | | | | SOPObject.cs. Does not implement security on IObjectInventory yet.
* | Merge branch 'master' into inventory-connectorDiva Canto2009-08-150-0/+0
|\ \
| * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-156-13/+62
| |\ \ | | |/
* | | Merge branch 'master' into inventory-connectorDiva Canto2009-08-151-1/+1
|\ \ \ | |/ /
| * | Changed one word in a commentDiva Canto2009-08-151-1/+1
| | |
* | | Merge branch 'master' of ../opensim-diva/ into inventory-connectorMelanie2009-08-1537-1370/+1013
|\ \ \ | |/ / | | / | |/ |/|
| * Changed FromAssetID to FromItemIDDiva Canto2009-08-156-25/+25
| |
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-155-29/+337
| |\
| * \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-141-112/+113
| |\ \
| * \ \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1414-88/+730
| |\ \ \
| * | | | Returning UUID.Zero is scene and user profile service are null in ↵Diva Canto2009-08-141-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 Canto2009-08-142-5/+19
| | | | | | | | | | | | | | | | | | | | HGBroker.
| * | | | More debug messages.Diva Canto2009-08-141-0/+7
| | | | |
| * | | | Doing session lookup in the right way.Diva Canto2009-08-142-8/+11
| | | | |
| * | | | Additional debug messages, and bug fix in ↵Diva Canto2009-08-142-2/+12
| | | | | | | | | | | | | | | | | | | | RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set.
| * | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-132-2/+203
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-133-1/+465
| |\ \ \ \ \
| * | | | | | Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.Diva Canto2009-08-1315-44/+168
| | | | | | |
| * | | | | | Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' ↵Diva Canto2009-08-1321-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | starting to get on my nerves.
| * | | | | | Inventory redirects from CachedUserInfo to InventoryService COMPLETE!Diva Canto2009-08-1310-390/+146
| | | | | | |
| * | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-136-36/+74
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1219-13/+484
| |\ \ \ \ \ \ \
| * | | | | | | | Redirected all calls to CachedUserProfile methods to the inventory service. ↵Diva Canto2009-08-1211-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/opensimAdam Frisby2009-08-1618-217/+940
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | * whoops, missing a /Teravus Ovares (Dan Olivares)2009-08-151-1/+1
| | | | | | | | |
| * | | | | | | | * Comment out XEngineTest that doesn't appear to test anything. It just ↵Teravus Ovares (Dan Olivares)2009-08-151-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: commentsTeravus Ovares (Dan Olivares)2009-08-151-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also re-trigger panda
| * | | | | | | | * minor : CommentsTeravus Ovares (Dan Olivares)2009-08-141-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also re-trigger Panda.
| * | | | | | | | * minor : commentsTeravus Ovares (Dan Olivares)2009-08-141-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also re-trigger panda
| * | | | | | | | * Put the StandaloneTeleportTest in a new thread and call Thread.Join() ↵Teravus Ovares (Dan Olivares)2009-08-141-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.txtTeravus Ovares (Dan Olivares)2009-08-141-1/+3
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-143-26/+53
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | * Re-enable TestLoadIarV0_1ExistingUsers()Justin Clark-Casey (justincc)2009-08-141-12/+3
| | | | | | | |
| | * | | | | | Re-enable TestSaveIarV0_1()Justin Clark-Casey (justincc)2009-08-142-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement more parts of TestAssetService
| | * | | | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-08-141-0/+1
| | |\ \ \ \ \ \
| | * | | | | | | Add standard doc and standard doc formatting to IAssetServiceJustin Clark-Casey (justincc)2009-08-142-10/+38
| | | | | | | | |
| * | | | | | | | * Kunnis' third patch in mantis: ↵Teravus Ovares (Dan Olivares)2009-08-141-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/opensimTeravus Ovares (Dan Olivares)2009-08-149-50/+436
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove NRE catching on TestReplicateArchivePathToUserInventory() since race ↵Justin Clark-Casey (justincc)2009-08-141-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-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.4.2)