aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-07-061-1/+1
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+1
| | | | | | | | it's timeout
* | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \
| * | Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | | | | | scattering them over other categories
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+10
|\ \ \ | |/ /
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ↵Justin Clark-Casey (justincc)2012-06-151-1/+10
| | | | | | | | | | | | | | | | | | logic. This does require the server to be added before it is set as the main Instance
* | | Merge branch 'master' into careminsterMelanie2012-06-141-1/+0
|\ \ \ | |/ /
| * | minor: remove unnecessary IsAttachment = false setting for new object in ↵Justin Clark-Casey (justincc)2012-06-141-1/+0
| | | | | | | | | | | | UploadObjectAssetModule, property always starts as false
* | | Merge branch 'master' into careminsterMelanie2012-05-191-39/+61
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| | |
| * | Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| | | | | | | | | | | | Refactor: eq message logging into common method.
| * | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-181-20/+33
| | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
* | | Merge branch 'master' into careminsterMelanie2012-05-101-1/+1
|\ \ \ | |/ /
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-1/+1
| | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | | Merge branch 'master' into careminsterMelanie2012-05-0512-80/+138
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-0312-80/+137
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'master' into careminsterMelanie2012-04-272-2/+5
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-1/+1
| | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| * minor: Add more detail to unauthorized caps client messageJustin Clark-Casey (justincc)2012-04-261-1/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-03-272-20/+58
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-272-20/+58
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-201-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-1/+1
| |
* | Remove debug output using Console.WriteLine and trim excessive whitespaceMelanie2012-03-191-8/+0
| |
* | some more work on costsUbitUmarov2012-03-161-22/+34
| |
* | Playing with object costs CAPS ...UbitUmarov2012-03-151-2/+118
| |
* | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-152-0/+28
| | | | | | | | For now on caps/EventQueue, and still only used on a material change...
* | Hook up the new cap to the SOP changesMelanie2012-03-131-8/+5
| |
* | Implement the cap to send extra physics params to the viewer. Not functionalMelanie2012-03-131-0/+38
|/ | | | yet because the parameters are not actually stored anywhere yet.
* Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
|
* When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-103-7/+14
| | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
* Fix:Get embedded objects in notecard ↵PixelTomsen2012-01-291-0/+71
| | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org>
* Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-282-4/+4
| | | | agent id anyway
* Implement the FetchInventory2 capability. This accompanies the existing ↵Justin Clark-Casey (justincc)2012-01-061-0/+151
| | | | | | | | | | FetchInventoryDescendents2 capability. Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2 However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
* Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-071-6/+0
| | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
* Stop accidentally setting up the UploadTexture caps handler with the same ↵Justin Clark-Casey (justincc)2011-12-061-1/+1
| | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
* Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-3/+3
| | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* refactor: Separate the upload baked texture handler out from BunchOfCapsJustin Clark-Casey (justincc)2011-12-012-122/+113
|
* On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+2
|
* Improve some of the debug help messagesJustin Clark-Casey (justincc)2011-11-291-0/+1
|
* Correct mistake in "debug eq" helpJustin Clark-Casey (justincc)2011-11-291-1/+1
|
* Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().Justin Clark-Casey (justincc)2011-11-261-1/+0
| | | | This has been handled by WebFetchInvDescHandler.Fetch() for some time.
* Use the same web fetch handler for every request from every avatar, since it ↵Justin Clark-Casey (justincc)2011-11-261-3/+11
| | | | contains no instance code
* Fix config so that you can have both WebFetchInventoryDescendents and ↵Justin Clark-Casey (justincc)2011-11-251-1/+2
| | | | FetchInvnetoryDescendents2 caps active at once
* Resolve error where an unknown asset type would cause the fetch inventory ↵Justin Clark-Casey (justincc)2011-11-251-4/+1
| | | | | | descendents cap to fail. Introduced just a few commits ago in 0688861
* Implement the FetchInventoryDescendents2 capability using the same code as ↵Justin Clark-Casey (justincc)2011-11-251-17/+38
| | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
* Fix WebFetchInventoryDescendents cap to use ↵Justin Clark-Casey (justincc)2011-11-251-0/+2
| | | | | | Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings These cover a wider range of types.
* comment out a noisy log line I accidentally left in from the last commitJustin Clark-Casey (justincc)2011-11-241-1/+1
|
* Stop passing a request handler to the initial caps.RegisterHandler in ↵Justin Clark-Casey (justincc)2011-11-241-157/+162
| | | | | | EventQueueGetModule since this is immediatley replaced by a poll server handler. This allows us to comment out a bunch of code and simplify the codebase and readability.