Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 5 | -36/+37 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-12 | 6 | -6/+237 |
| |\ \ \ \ \ | |||||
| * | | | | | | Redirected all calls to CachedUserProfile methods to the inventory service. ↵ | Diva Canto | 2009-08-12 | 10 | -858/+570 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -89/+365 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | * 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. | ||||
| * | | | | | * 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-14 | 5 | -47/+25 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | * allocate the dictionary for AgentCircuitData.ChildrenCapSeeds when ↵ | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating the circuitdata object to see if it's the cause of a null reference exception in the TestAddNeighbourRegio test | ||||
| * | | | | | | | Add standard doc and standard doc formatting to IAssetService | Justin Clark-Casey (justincc) | 2009-08-14 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Remove NRE catching on TestReplicateArchivePathToUserInventory() since race ↵ | Justin Clark-Casey (justincc) | 2009-08-14 | 1 | -27/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | failure now appears to have gone | ||||
| * | | | | | | Remove one more sponsor reference | Melanie | 2009-08-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Remove the script sponsor logic because scripts are timing out again. | Melanie | 2009-08-14 | 4 | -19/+15 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | * Beginnings of a Security Credential system in MRM. This will eventually ↵ | Adam Frisby | 2009-08-16 | 6 | -13/+62 |
|/ / / / / | | | | | | | | | | | | | | | | lead to trusted execution of untrusted MRMs. | ||||
* | | | | | Deal with possible race in TestAddNeighborRegion in ScenePresenceTests | Teravus Ovares (Dan Olivares) | 2009-08-13 | 1 | -0/+24 |
| |_|_|/ |/| | | | |||||
* | | | | Add some extra info to script load messages | Melanie | 2009-08-14 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Some small fixes | Melanie | 2009-08-13 | 1 | -1/+2 |
| | | | |||||
* | | | Add reference to the profile module in the avatar profiles handler, plus | Melanie | 2009-08-13 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | an example of how to override legacy core data with data retrieved from the profile module | ||||
* | | | Formatting cleanup. Fix some compiler warnings. | Jeff Ames | 2009-08-13 | 4 | -36/+28 |
| |/ |/| | |||||
* | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-12 | 2 | -2/+56 |
|\ \ | |||||
| * | | Formatting cleanup. Add copyright headers. | Jeff Ames | 2009-08-13 | 2 | -2/+56 |
| |/ | |||||
* | | * minor: Comments | Teravus Ovares (Dan Olivares) | 2009-08-12 | 4 | -4/+181 |
|/ | |||||
* | * Added two new packet handler implementations for inventory ops. This is ↵ | Diva Canto | 2009-08-12 | 7 | -77/+304 |
| | | | | | | | starting to work! - but can't be activated incrementally, the flip needs to be global for all inventory ops. * Added a base inventory connector that does common processing of inventory among all reference connector implementations. E.g. AddItem requires additional processing before being forwarded to service. * Added if (m_Enabled) upon RemoveRegion | ||||
* | Better test for dropping inventory cache and writing out debug messages. | Diva Canto | 2009-08-12 | 1 | -16/+21 |
| | |||||
* | Fixes a race condition in EQ processing that was making EQs pop up again ↵ | Diva Canto | 2009-08-11 | 3 | -21/+25 |
| | | | | | | upon client close. Commented remote call on GetSystemFolders again, so that it's not live yet. | ||||
* | Fixed test for detecting when user is no longer in sim. | Diva Canto | 2009-08-11 | 1 | -3/+5 |
| | |||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-11 | 1 | -1/+1 |
|\ | |||||
| * | Do new inventory module setup, which is why the test was failing (not the ↵ | Justin Clark-Casey (justincc) | 2009-08-11 | 1 | -1/+1 |
| | | | | | | | | | | | | original race condition, hopefully!) Still always catching the NRE for now pending analysis | ||||
* | | Merged with origin, and resolved one conflict in LoginServiceTests.cs | Diva Canto | 2009-08-11 | 6 | -25/+69 |
|\ \ | |/ |