aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into ↵Diva Canto2009-08-164-3/+6
|\ | | | | | | inventory-connector
| * Misc cleanup.Jeff Ames2009-08-163-3/+3
| |
| * Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ↵Adam Johnson2009-08-161-0/+3
| | | | | | | | Handler - ref mantis #4010
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-142-12/+216
|\ \ | |/
| * * Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing ↵Teravus Ovares (Dan Olivares)2009-08-132-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/opensimDiva Canto2009-08-131-0/+201
|\ \ | |/
| * * 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-132-1/+464
|\ \ | |/
| * * Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ↵Teravus Ovares (Dan Olivares)2009-08-131-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/opensimTeravus Ovares (Dan Olivares)2009-08-131-0/+37
| |\
| * | * minor: commentsTeravus Ovares (Dan Olivares)2009-08-131-1/+125
| | |
* | | Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.Diva Canto2009-08-131-0/+5
| | |
* | | Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' ↵Diva Canto2009-08-133-11/+11
| | | | | | | | | | | | starting to get on my nerves.
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-131-0/+37
|\ \ \ | | |/ | |/|
| * | Add a profile module interface for the client view to useMelanie2009-08-131-0/+37
| |/
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1211-6/+213
|\ \ | |/
| * minor:commentsTeravus Ovares (Dan Olivares)2009-08-127-5/+91
| |
| * minor: commentsTeravus Ovares (Dan Olivares)2009-08-123-0/+121
| |
| * Formatting cleanup. Add copyright headers.Jeff Ames2009-08-131-1/+1
| |
* | Redirected all calls to CachedUserProfile methods to the inventory service. ↵Diva Canto2009-08-121-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 Canto2009-08-121-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 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.
* Re-adding a conditional in UserManager that was removed with arthusv's ↵Diva Canto2009-08-111-1/+1
| | | | commit. Changing new inventory ops to POST.
* Merged with origin, and resolved one conflict in LoginServiceTests.csDiva Canto2009-08-116-78/+140
|\
| * Apply http://opensimulator.org/mantis/view.php?id=1448Justin Clark-Casey (justincc)2009-08-111-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 Down2009-08-111-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-112-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 Valadares2009-08-113-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 Canto2009-08-101-0/+10
| | | | | | | | GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet.
* | Changed RequestRootFolder to GetRootFolderDiva Canto2009-08-102-2/+2
|/
* Last piece of cleaning up old inventory. Old IInventoryServices and ↵Diva Canto2009-08-103-258/+2
| | | | ISecureInventoryService interfaces removed.
* Conditional to prevent a null ref in tests. The tests may still not pass.Diva Canto2009-08-101-1/+1
|
* First pass at cleaning up old OGS1 and Local Inventory: removed ↵Diva Canto2009-08-101-114/+0
| | | | everything-inventory in CommsManager, which wasn't actively used anymore.
* AssetCache.addin.xml seems to be historical junk too. Removed.Diva Canto2009-08-101-17/+0
|
* Removed IAssetServer.Diva Canto2009-08-101-38/+0
|
* Slowly working my way towards the elimination of IAssetServer and IAssetCache.Diva Canto2009-08-102-122/+6
|
* More clean up from asset cache legacy. None of these classes are used anymore.Diva Canto2009-08-104-1066/+0
|
* Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-101-0/+6
|\
| * Added some help instructions to the new RegionInfo region setup process; ↵Adam Frisby2009-08-101-0/+6
| | | | | | | | mainly to point out 'yes you can input information here.' since it seems to elude some users.
* | Removing unused files, legacy from old asset "cache".Diva Canto2009-08-092-185/+0
|/
* Removed HGInventory out of core. This is part of HG2, which it now being ↵Diva Canto2009-08-091-744/+0
| | | | developed outside.
* * FreeContext may be a bit too buggy for my tastes in some environments. * ↵Teravus Ovares (Dan Olivares)2009-08-081-7/+7
| | | | Commenting it for the moment.
* Change the default for internal IP address back to 0.0.0.0Melanie2009-08-081-1/+1
|
* Remove debugging output frm ini file loading. Make it collect matchingMelanie2009-08-071-10/+8
| | | | files only from last path component.
* Add extensive debug output to Util.GlobMelanie2009-08-071-0/+9
|
* Remove GetFullPath call from config includes, because it barfs in WindozeMelanie2009-08-071-3/+0
|
* Add a method to init the OSSL Api's m_LSL_Api member back to the OSSL ApiMelanie2009-08-071-0/+3
|
* Added ToXml2() to ISceneObject, so that components other than regions can ↵Diva Canto2009-08-061-0/+1
| | | | use this abstraction.
* Allow arbitrary wildcards in config includes. Things likeMelanie2009-08-061-0/+51
| | | | | Include-Modules = "addin-modules/*/config/*.ini" will now work. Adds Util.Glob, which will resolve a globbed path into a string list.
* * Patch from jhurliman to add accept type recognition to determine the llsd ↵Teravus Ovares (Dan Olivares)2009-08-051-7/+67
| | | | | | content format. *should allow both json and xml serializations of llsd to work properly. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>