Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 2 | -2/+203 |
|\ | |||||
| * | Add some extra info to script load messages | Melanie | 2009-08-14 | 1 | -2/+2 |
| | | |||||
| * | * Add AgentCircuitManager tests for adding, removing, changing circuit code, ↵ | Teravus Ovares (Dan Olivares) | 2009-08-13 | 1 | -0/+201 |
| | | | | | | | | and authentication. | ||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 3 | -1/+465 |
|\ \ | |/ | |||||
| * | * Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ↵ | Teravus Ovares (Dan Olivares) | 2009-08-13 | 2 | -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/opensim | Teravus Ovares (Dan Olivares) | 2009-08-13 | 6 | -36/+74 |
| |\ | |||||
| * | | * minor: comments | Teravus Ovares (Dan Olivares) | 2009-08-13 | 1 | -1/+125 |
| | | | |||||
* | | | 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 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | ||||
| * | | Add a profile module interface for the client view to use | Melanie | 2009-08-13 | 1 | -0/+37 |
| | | | |||||
| * | | Formatting cleanup. Fix some compiler warnings. | Jeff Ames | 2009-08-13 | 4 | -36/+28 |
| |/ | |||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-12 | 19 | -13/+484 |
|\ \ | |/ | |||||
| * | minor:comments | Teravus Ovares (Dan Olivares) | 2009-08-12 | 7 | -5/+91 |
| | | |||||
| * | minor: comments | Teravus Ovares (Dan Olivares) | 2009-08-12 | 4 | -0/+127 |
| | | |||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-12 | 4 | -4/+85 |
| |\ | |||||
| | * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2009-08-13 | 4 | -4/+85 |
| | | | |||||
| * | | * minor: Comments | Teravus Ovares (Dan Olivares) | 2009-08-12 | 4 | -4/+181 |
| |/ | |||||
* | | 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. | ||||
* | * Added two new packet handler implementations for inventory ops. This is ↵ | Diva Canto | 2009-08-12 | 8 | -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 Canto | 2009-08-12 | 1 | -16/+21 |
| | |||||
* | change 535cb0efc so that the default LLSD serialization format is | dr scofield (aka dirk husemann) | 2009-08-12 | 1 | -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 Ames | 2009-08-12 | 1 | -1/+9 |
| | |||||
* | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-08-11 | 28 | -147/+911 |
|\ | |||||
| * | Fixes a race condition in EQ processing that was making EQs pop up again ↵ | Diva Canto | 2009-08-11 | 4 | -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 Canto | 2009-08-11 | 2 | -13/+17 |
| | | | | | | | | just to make this work. | ||||
| * | Re-adding a conditional in UserManager that was removed with arthusv's ↵ | Diva Canto | 2009-08-11 | 3 | -4/+4 |
| | | | | | | | | commit. Changing new inventory ops to POST. | ||||
| * | Added new operations to mock inventory service in tests. | Diva Canto | 2009-08-11 | 1 | -0/+15 |
| | | |||||
| * | Fixed test for detecting when user is no longer in sim. | Diva Canto | 2009-08-11 | 1 | -3/+5 |
| | | |||||
| * | Disabling the remote call for the time being, so that I can test it on a ↵ | Diva Canto | 2009-08-11 | 1 | -10/+11 |
| | | | | | | | | grid before making it live. | ||||
| * | 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 | ||||
| * | | Added http handlers for the two new inventory operations. | Diva Canto | 2009-08-11 | 2 | -4/+46 |
| | | | |||||
| * | | Merged with origin, and resolved one conflict in LoginServiceTests.cs | Diva Canto | 2009-08-11 | 17 | -141/+485 |
| |\ \ | | |/ | |||||
| | * | Re-enable TestReplicateArchivePathToUserInventory() but stop it failing on ↵ | Justin Clark-Casey (justincc) | 2009-08-11 | 2 | -10/+26 |
| | | | | | | | | | | | | | | | | | | the NRE for now Add temporarily logging for diagnosis | ||||
| | * | Apply http://opensimulator.org/mantis/view.php?id=1448 | Justin Clark-Casey (justincc) | 2009-08-11 | 3 | -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/opensim | Justin Clark-Casey (justincc) | 2009-08-11 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Disable test again. Ho hum. | Justin Clark-Casey (justincc) | 2009-08-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | Enable the console show version command and the viewer about command, to ↵ | Chris Down | 2009-08-11 | 2 | -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-11 | 1 | -1/+1 |
| | | | | | | | | | | | | if the race condition has been vanquished | ||||
| | * | Establish CachedUserInfo.OnInventoryReceived event so that region/test ↵ | Justin Clark-Casey (justincc) | 2009-08-11 | 4 | -63/+140 |
| | | | | | | | | | | | | inventory code can be written with the async inventory fetch | ||||
| * | | Improved test for system folders. Removed log messages. | Diva Canto | 2009-08-11 | 3 | -5/+7 |
| | | | |||||
| * | | System folders inventory cache added to OUT inventory modules. This tracks ↵ | Diva Canto | 2009-08-11 | 8 | -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 Canto | 2009-08-10 | 10 | -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/opensim | Diva Canto | 2009-08-10 | 43 | -46/+46 |
| |\ \ | |||||
| * | | | Changed RequestRootFolder to GetRootFolder | Diva Canto | 2009-08-10 | 9 | -12/+12 |
| | | | | |||||
* | | | | Try something to help the tests complete. | Teravus Ovares (Dan Olivares) | 2009-08-11 | 11 | -11/+110 |
| |_|/ |/| | |