aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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 GetSession....Diva Canto2009-08-141-0/+8
| * | | | Changed the way to get to the profile service. Changed GetSystemsFolder in HG...Diva Canto2009-08-142-5/+19
| * | | | 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 RemoteInventoryServiceConnector.cs,...Diva Canto2009-08-142-2/+12
| * | | | 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' starting...Diva Canto2009-08-1321-70/+70
| * | | | | | 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. R...Diva Canto2009-08-1211-859/+580
* | | | | | | | | 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 crea...Teravus Ovares (Dan Olivares)2009-08-151-0/+3
| * | | | | | | | * minor: commentsTeravus Ovares (Dan Olivares)2009-08-151-2/+99
| * | | | | | | | * minor : CommentsTeravus Ovares (Dan Olivares)2009-08-141-3/+68
| * | | | | | | | * minor : commentsTeravus Ovares (Dan Olivares)2009-08-141-3/+69
| * | | | | | | | * Put the StandaloneTeleportTest in a new thread and call Thread.Join() insid...Teravus Ovares (Dan Olivares)2009-08-141-20/+95
| * | | | | | | | * 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
| | * | | | | | 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: http://opensimulator.org/mantis/view.php?id=...Teravus Ovares (Dan Olivares)2009-08-141-112/+113
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-149-50/+436
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove NRE catching on TestReplicateArchivePathToUserInventory() since race f...Justin Clark-Casey (justincc)2009-08-141-27/+9
| | * | | | | | Return minimum mono version in README to 2.0.1 for now (recommended is still ...Justin Clark-Casey (justincc)2009-08-141-1/+1
| | * | | | | | minor formatting adjustmentsJustin Clark-Casey (justincc)2009-08-141-2/+10
| | * | | | | | Adding in Reflection-based testing, to ensure that all properties are covered.Kunnis2009-08-142-0/+400
| | * | | | | | Remove one more sponsor referenceMelanie2009-08-141-1/+1
| | * | | | | | Remove the script sponsor logic because scripts are timing out again.Melanie2009-08-144-19/+15
| * | | | | | | * allocate the dictionary for AgentCircuitData.ChildrenCapSeeds when creating...Teravus Ovares (Dan Olivares)2009-08-141-0/+1
| |/ / / / / /
* | | | | | | * Beginnings of a Security Credential system in MRM. This will eventually lea...Adam Frisby2009-08-166-13/+62
|/ / / / / /
* | | | | | Deal with possible race in TestAddNeighborRegion in ScenePresenceTestsTeravus Ovares (Dan Olivares)2009-08-131-0/+24
* | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-131-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add some extra info to script load messagesMelanie2009-08-141-2/+2
* | | | | | * Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing ...Teravus Ovares (Dan Olivares)2009-08-132-12/+216
|/ / / / /
* | | | | * Add AgentCircuitManager tests for adding, removing, changing circuit code, ...Teravus Ovares (Dan Olivares)2009-08-131-0/+201
| |_|_|/ |/| | |
* | | | * Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure...Teravus Ovares (Dan Olivares)2009-08-132-0/+340
* | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-136-36/+74
|\ \ \ \ | | |_|/ | |/| |