aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-132-2/+203
|\
| * Add some extra info to script load messagesMelanie2009-08-141-2/+2
| |
| * * Add AgentCircuitManager tests for adding, removing, changing circuit code, ↵Teravus Ovares (Dan Olivares)2009-08-131-0/+201
| | | | | | | | and authentication.
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-133-1/+465
|\ \ | |/
| * * Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ↵Teravus Ovares (Dan Olivares)2009-08-132-0/+340
| | | | | | | | ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test.
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-136-36/+74
| |\
| * | * minor: commentsTeravus Ovares (Dan Olivares)2009-08-131-1/+125
| | |
* | | 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
|\ \ \ | | |/ | |/|
| * | Some small fixesMelanie2009-08-131-1/+2
| | |
| * | Add reference to the profile module in the avatar profiles handler, plusMelanie2009-08-131-0/+8
| | | | | | | | | | | | | | | an example of how to override legacy core data with data retrieved from the profile module
| * | Add a profile module interface for the client view to useMelanie2009-08-131-0/+37
| | |
| * | Formatting cleanup. Fix some compiler warnings.Jeff Ames2009-08-134-36/+28
| |/
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1219-13/+484
|\ \ | |/
| * minor:commentsTeravus Ovares (Dan Olivares)2009-08-127-5/+91
| |
| * minor: commentsTeravus Ovares (Dan Olivares)2009-08-124-0/+127
| |
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-124-4/+85
| |\
| | * Formatting cleanup. Add copyright headers.Jeff Ames2009-08-134-4/+85
| | |
| * | * minor: CommentsTeravus Ovares (Dan Olivares)2009-08-124-4/+181
| |/
* | 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.
* * Added two new packet handler implementations for inventory ops. This is ↵Diva Canto2009-08-128-77/+323
| | | | | | | 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 Canto2009-08-121-16/+21
|
* change 535cb0efc so that the default LLSD serialization format isdr scofield (aka dirk husemann)2009-08-121-2/+4
| | | | | | | llsd+xml instead of llsd+json --- the latter seems to break existing bots. this assumes that those bots that want llsd+json will properly signal that desire, if that is not the case, we need to revisit this. fixes mantis #3977.
* Thanks jonc for a patch to ignore some Visual Studio and generated ini files.Jeff Ames2009-08-121-1/+9
|
* Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-1128-147/+911
|\
| * Fixes a race condition in EQ processing that was making EQs pop up again ↵Diva Canto2009-08-114-35/+39
| | | | | | | | | | | | upon client close. Commented remote call on GetSystemFolders again, so that it's not live yet.
| * Some more hammering on the head of the obsolete rest inventory handlers, ↵Diva Canto2009-08-112-13/+17
| | | | | | | | just to make this work.
| * Re-adding a conditional in UserManager that was removed with arthusv's ↵Diva Canto2009-08-113-4/+4
| | | | | | | | commit. Changing new inventory ops to POST.
| * Added new operations to mock inventory service in tests.Diva Canto2009-08-111-0/+15
| |
| * Fixed test for detecting when user is no longer in sim.Diva Canto2009-08-111-3/+5
| |
| * Disabling the remote call for the time being, so that I can test it on a ↵Diva Canto2009-08-111-10/+11
| | | | | | | | grid before making it live.
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-111-1/+1
| |\
| | * Do new inventory module setup, which is why the test was failing (not the ↵Justin Clark-Casey (justincc)2009-08-111-1/+1
| | | | | | | | | | | | | | | | | | original race condition, hopefully!) Still always catching the NRE for now pending analysis
| * | Added http handlers for the two new inventory operations.Diva Canto2009-08-112-4/+46
| | |
| * | Merged with origin, and resolved one conflict in LoginServiceTests.csDiva Canto2009-08-1117-141/+485
| |\ \ | | |/
| | * Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on ↵Justin Clark-Casey (justincc)2009-08-112-10/+26
| | | | | | | | | | | | | | | | | | the NRE for now Add temporarily logging for diagnosis
| | * Apply http://opensimulator.org/mantis/view.php?id=1448Justin Clark-Casey (justincc)2009-08-113-1/+14
| | | | | | | | | | | | | | | | | | Store and retrieve user profile url at runtime Not yet persisted Thanks Fly-Man
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-08-111-1/+1
| | |\
| | | * Disable test again. Ho hum.Justin Clark-Casey (justincc)2009-08-111-1/+1
| | | |
| | * | Enable the console show version command and the viewer about command, to ↵Chris Down2009-08-112-22/+47
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show the last git commit hash together with the conmit date and time. The data is retrieved form a file bin/.version This file can be generated automatically using the post commit script by adding the following to the script: git log -n 1 --pretty="format:%h: %ci" > bin/.version This command can also be run manually to create the bin/.version file. This command genrates a short form of the commit hash and a date and time of the commit in ISO8601 format. If a full commit hash is required then change %h to %H The logic that is used to extract the deprecated svn revision is still included. It will be removed at a future date
| | * re-enable just TestReplicateArchivePathToUserInventory() for now to find out ↵Justin Clark-Casey (justincc)2009-08-111-1/+1
| | | | | | | | | | | | if the race condition has been vanquished
| | * Establish CachedUserInfo.OnInventoryReceived event so that region/test ↵Justin Clark-Casey (justincc)2009-08-114-63/+140
| | | | | | | | | | | | inventory code can be written with the async inventory fetch
| * | Improved test for system folders. Removed log messages.Diva Canto2009-08-113-5/+7
| | |
| * | System folders inventory cache added to OUT inventory modules. This tracks ↵Diva Canto2009-08-118-43/+233
| | | | | | | | | | | | agents in and out of *sims* in order to fetch/drop their system folders from the cache. Also added region-side support for fetching the system folders from the inventory service. Nothing of this is called yet.
| * | Added two new methods to IIventoryService -- GetFolderForType and ↵Diva Canto2009-08-1010-7/+261
| | | | | | | | | | | | GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet.
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1043-46/+46
| |\ \
| * | | Changed RequestRootFolder to GetRootFolderDiva Canto2009-08-109-12/+12
| | | |
* | | | Try something to help the tests complete.Teravus Ovares (Dan Olivares)2009-08-1111-11/+110
| |_|/ |/| |