Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-19 | 3 | -2/+44 |
|\ | |||||
| * | Graft the REST console onto the message server as well. What a dirty hack! | Melanie | 2009-08-19 | 1 | -1/+15 |
| | | | | | | | | Works the same as the others. | ||||
| * | Graft the REST console onto the grid server. Same procedure as with | Melanie | 2009-08-19 | 1 | -1/+15 |
| | | | | | | | | the user server. | ||||
| * | Add rest console support to the user server. Will ask new questions at | Melanie | 2009-08-19 | 1 | -0/+14 |
| | | | | | | | | | | | | startup. To use, run it normally once, answering the questions, then run again with -console=rest. Also now supports -console=basic for a console that reads stdin | ||||
* | | A better purge of trash folder. | Diva Canto | 2009-08-19 | 3 | -3/+5 |
| | | |||||
* | | jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024 | Diva Canto | 2009-08-18 | 1 | -0/+6 |
|/ | |||||
* | Added one conditional missing on login, for creating inventory if it doesn't ↵ | Diva Canto | 2009-08-17 | 1 | -1/+13 |
| | | | | exist already. This hopefully fixes the master avatar problems on standalone. | ||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-17 | 2 | -0/+15 |
|\ | |||||
| * | Apply http://opensimulator.org/mantis/view.php?id=4016 | Justin Clark-Casey (justincc) | 2009-08-17 | 1 | -0/+13 |
| | | | | | | | | | | Make previously hidden cookies available to code Thanks jhurliman | ||||
| * | * More Test tweaking to get down to the root cause of the test wierdness | Teravus Ovares (Dan Olivares) | 2009-08-17 | 1 | -0/+2 |
| | | |||||
* | | Bumping the interface number down again, because this *may* not be a ↵ | Diva Canto | 2009-08-17 | 1 | -1/+1 |
| | | | | | | | | breaking change with older sims. | ||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-17 | 3 | -31/+536 |
|\ \ | |/ | |||||
| * | Add the OpenSim.ConsoleClient app. | Melanie | 2009-08-17 | 2 | -12/+124 |
| | | | | | | | | | | Usage: OpenSim.ConsoleClient -h <host> -p <port> -u <user> -P <pass> host defaults to localhost, port defaults to 8003. | ||||
| * | Filling in the blanks: The "meat" of the REST console | Melanie | 2009-08-17 | 2 | -9/+385 |
| | | |||||
| * | * handle litjson errors for now. We'll remove this when we hear back from ↵ | Teravus Ovares (Dan Olivares) | 2009-08-16 | 1 | -21/+38 |
| | | | | | | | | http://jira.openmetaverse.org/browse/LIBOMV-675 | ||||
* | | Bumped up grid services interface number. | Diva Canto | 2009-08-16 | 1 | -1/+1 |
| | | |||||
* | | uh. how about *really* removing it, and not just write a comment above, hey ↵ | Diva Canto | 2009-08-16 | 1 | -1/+1 |
| | | | | | | | | diva? | ||||
* | | Remove the call to ResetAttachments upon login. The info in the DB should ↵ | Diva Canto | 2009-08-16 | 1 | -1/+3 |
| | | | | | | | | always have {itemID, assetID}. | ||||
* | | IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld ↵ | Diva Canto | 2009-08-16 | 1 | -0/+6 |
| | | | | | | | | UUID. | ||||
* | | Making attachments work again. Tons of debug more. This needs more testing ↵ | Diva Canto | 2009-08-16 | 2 | -1/+64 |
| | | | | | | | | and a lot of cleaning. | ||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into ↵ | Diva Canto | 2009-08-16 | 4 | -3/+6 |
|\ \ | |/ | | | | | inventory-connector | ||||
| * | Misc cleanup. | Jeff Ames | 2009-08-16 | 3 | -3/+3 |
| | | |||||
| * | Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ↵ | Adam Johnson | 2009-08-16 | 1 | -0/+3 |
| | | | | | | | | Handler - ref mantis #4010 | ||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-14 | 2 | -12/+216 |
|\ \ | |/ | |||||
| * | * Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing ↵ | Teravus Ovares (Dan Olivares) | 2009-08-13 | 2 | -12/+216 |
| | | | | | | | | | | | | a thread, a dead thread, and a null Thread * Fix a null thread situation | ||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 1 | -0/+201 |
|\ \ | |/ | |||||
| * | * 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 | 2 | -1/+464 |
|\ \ | |/ | |||||
| * | * Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ↵ | Teravus Ovares (Dan Olivares) | 2009-08-13 | 1 | -0/+339 |
| | | | | | | | | 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 | 1 | -0/+37 |
| |\ | |||||
| * | | * 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 | 1 | -0/+5 |
| | | | |||||
* | | | Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' ↵ | Diva Canto | 2009-08-13 | 3 | -11/+11 |
| | | | | | | | | | | | | starting to get on my nerves. | ||||
* | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-13 | 1 | -0/+37 |
|\ \ \ | | |/ | |/| | |||||
| * | | Add a profile module interface for the client view to use | Melanie | 2009-08-13 | 1 | -0/+37 |
| |/ | |||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-08-12 | 11 | -6/+213 |
|\ \ | |/ | |||||
| * | minor:comments | Teravus Ovares (Dan Olivares) | 2009-08-12 | 7 | -5/+91 |
| | | |||||
| * | minor: comments | Teravus Ovares (Dan Olivares) | 2009-08-12 | 3 | -0/+121 |
| | | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2009-08-13 | 1 | -1/+1 |
| | | |||||
* | | Redirected all calls to CachedUserProfile methods to the inventory service. ↵ | Diva Canto | 2009-08-12 | 1 | -1/+10 |
|/ | | | | 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 | 1 | -0/+19 |
| | | | | | | | 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 | ||||
* | 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. | ||||
* | Re-adding a conditional in UserManager that was removed with arthusv's ↵ | Diva Canto | 2009-08-11 | 1 | -1/+1 |
| | | | | commit. Changing new inventory ops to POST. | ||||
* | Merged with origin, and resolved one conflict in LoginServiceTests.cs | Diva Canto | 2009-08-11 | 6 | -78/+140 |
|\ | |||||
| * | Apply http://opensimulator.org/mantis/view.php?id=1448 | Justin Clark-Casey (justincc) | 2009-08-11 | 1 | -0/+11 |
| | | | | | | | | | | | | Store and retrieve user profile url at runtime Not yet persisted Thanks Fly-Man | ||||
| * | Enable the console show version command and the viewer about command, to ↵ | Chris Down | 2009-08-11 | 1 | -22/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Establish CachedUserInfo.OnInventoryReceived event so that region/test ↵ | Justin Clark-Casey (justincc) | 2009-08-11 | 2 | -47/+68 |
| | | | | | | | | inventory code can be written with the async inventory fetch | ||||
| * | * Improves SceneSetupHelper to allow the tester to choose a real or mock, ↵ | Arthur Valadares | 2009-08-11 | 3 | -128/+15 |
| | | | | | | | | | | | | | | | | inventory and asset, service modules. The boolean startServices was replaced with realServices string. If the string contains the word asset, it will start a real asset module, if it contains inventory, it starts a real inventory. Otherwise, it use mock (NullPlugin-like) objects, for tests that don't really need functionality. * SetupScene is now actually sharing the asset and inventory modules if the tester wishes to have multiple regions connected. To link regions, just start SetupScene with the same CommunicationManager for all scenes. SceneSetupHelper will hold a static reference to the modules and won't initialize them again, just run the scenes through the modules AddRegion, RegionLoaded and PostInitialize. * With the recent changes, both asset and inventory (and in the future, user) services should always be asked from the scene, not instantiated alone. The tests should reflect this new behavior and always start a scene. | ||||
* | | Added two new methods to IIventoryService -- GetFolderForType and ↵ | Diva Canto | 2009-08-10 | 1 | -0/+10 |
| | | | | | | | | GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet. | ||||
* | | Changed RequestRootFolder to GetRootFolder | Diva Canto | 2009-08-10 | 2 | -2/+2 |
|/ |