aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Moved the small HGUuidGatherer class to the file where its parent class is. ↵Diva Canto2012-09-213-74/+38
| | | | No need to keep 2 separate files.
* Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already ↵Diva Canto2012-09-211-18/+24
| | | | downloads the assets, so we don't need to do it again...
* Minor: may avoid crashes of sims that still don't have this configuration ↵Diva Canto2012-09-212-1/+4
| | | | section.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-218-180/+210
|\
| * minor: Make slow outgoing request log messages consistent with other log ↵Justin Clark-Casey (justincc)2012-09-211-7/+7
| | | | | | | | messages
| * Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't ↵Justin Clark-Casey (justincc)2012-09-212-9/+6
| | | | | | | | been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical.
| * Simplify UuidGatherer by performing asset fetch synchronously rather than ↵Justin Clark-Casey (justincc)2012-09-211-40/+44
| | | | | | | | using the async call but waiting for completion anyway!
| * Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-215-106/+112
| | | | | | | | | | | | As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead. So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway. If this facility is actually being used then please notify me or uncomment it if you are core.
| * Add request number counting to incoming HTTP requests in the same way that ↵Justin Clark-Casey (justincc)2012-09-212-19/+42
| | | | | | | | | | | | | | | | | | this was already being done for outgoing HTTP requests. This allows us to associate debug logging messages with the right request. It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some. This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled. This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
* | HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-214-10/+37
| |
* | Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-212-2/+2
| |
* | Improvement over last commit: refactor the asset permissions code, so that ↵Diva Canto2012-09-204-66/+98
|/ | | | it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-2012-56/+288
|\
| * Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ↵Justin Clark-Casey (justincc)2012-09-203-32/+87
| | | | | | | | | | | | | | request took. This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed. This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
| * Add ability to turn on/off logging of outgoing HTTP requests flowing through ↵Justin Clark-Casey (justincc)2012-09-203-35/+103
| | | | | | | | | | | | | | | | | | WebUtil. This is for debugging purposes. This is controlled via the "debug http" command which can already log incoming requests. This now gains a mandatory parameter of in, out or all to control what is logged. Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
| * Don't fail to create an IRC nick if nick randomization is disabled in the ↵Justin Clark-Casey (justincc)2012-09-201-3/+3
| | | | | | | | | | | | | | IRC module. Patch from http://opensimulator.org/mantis/view.php?id=6293 Thanks Starflower.
| * Documentation of teleport-related eventsSignpostMarv2012-09-201-0/+19
| |
| * minor tweaks to existing comments for IDE goodnessSignpostMarv2012-09-201-4/+7
| |
| * Documentation of agent-related eventsSignpostMarv2012-09-201-1/+34
| |
| * Documentation of object-related eventsSignpostMarv2012-09-201-1/+38
| |
| * Documentation of OnPluginConsoleSignpostMarv2012-09-201-0/+16
| |
| * Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-202-2/+3
| | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| * Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this ↵Justin Clark-Casey (justincc)2012-09-205-0/+0
| | | | | | | | time using lkalif's linux libraries built against a much earlier libc (2.7)
* | More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-204-18/+116
|/ | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
* Correctly override and call base OpenSimTestCase.SetUp() method in ↵Justin Clark-Casey (justincc)2012-09-193-6/+11
| | | | | | GridConnectorsTests and ArchiverTests. Remove unrelated compile warning from AttachmentsModuleTests.
* Downgrade libopenjpeg back to 1.3 from 1.5.Justin Clark-Casey (justincc)2012-09-195-0/+0
| | | | | This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc Further investigation pending.
* Add openmetaverse_data from libopenmetaverse to allow testing of texture ↵Justin Clark-Casey (justincc)2012-09-1860-0/+12308
| | | | baking via bot rather than just throwing out errors
* Update libopenmetaverse components to commit f5cecaajustincc2012-09-1815-5/+3
| | | | | | | Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5. DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs. libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues.
* Cleanup from prev. commitBlueWall2012-09-182-4/+4
| | | | Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit
* Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-184-13/+13
| | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* Moving ScriptModuleComms into the CoreModules tree.Mic Bowman2012-09-171-0/+0
|
* Documentation of IScriptModuleComms.RegisterConstant and ↵SignpostMarv2012-09-171-1/+18
| | | | | | IScriptModuleComms.LookupModConstant Signed-off-by: Melanie <melanie@t-data.com>
* Implementing ability to register script constants and invocations on a ↵SignpostMarv2012-09-172-0/+54
| | | | region module automatically
* preventing a null reference exception from being thrownSignpostMarv2012-09-171-0/+3
| | | | Signed-off-by: Melanie <melanie@t-data.com>
* script invocations cannot have void return typeSignpostMarv2012-09-171-9/+9
|
* HG2.0: Generalized the allowed HG appearances to be more than 1.Diva Canto2012-09-161-31/+59
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1537-1240/+2322
|\
| * BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-155-1/+1
| |
| * BulletSim: some debugging prints in BSPrim for tracking changes in linkset ↵Robert Adams2012-09-151-1/+3
| | | | | | | | children.
| * BulletSim: add the debugging routine DumpRigidBody2() to API2.Robert Adams2012-09-151-3/+6
| |
| * BulletSim: another attempt at computing physics FPS correctly.Robert Adams2012-09-151-23/+6
| |
| * BulletSim: remove timeStep parameter from calls for vehicle parameter ↵Robert Adams2012-09-152-9/+6
| | | | | | | | setting. There is no reason these should be using the simulation time interval for parameter calculation.
| * BulletSim: Remove calculation and passing of unused collied object type.Robert Adams2012-09-154-28/+36
| | | | | | | | | | Fix collision code to properly sense mega-region children regions as terrain. When setting an object physical, reset all the physical properties (friction, ...).
| * BulletSim: set all linkset objects center of mass to the whole linkset's ↵Robert Adams2012-09-151-2/+15
| | | | | | | | center of mass
| * BulletSim: Add calls to linkset class when object going static or dynamic.Robert Adams2012-09-152-8/+32
| | | | | | | | Reset center of mass on an object when going dynamic.
| * BulletSim: remove unused NeedsMeshing() code from BSScene.Robert Adams2012-09-151-116/+0
| |
| * BulletSim: Add 'IsNativeShape2' callRobert Adams2012-09-151-4/+7
| |
| * BulletSim: Way too many changes in one commit.Robert Adams2012-09-159-286/+351
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many changes to BSDynamic for readability and commentary. Linkset hacking for vehicles: don't over mass the root prim. Add parameter for link constraint solver iterations. Correct uses of timestep in timescale calculations for vehicles. Reorganize code/logic for making objects static and dynamic for readability and use of API2. Changed most calls in BSPrim to use API2 calls (the new way). Avatars do not generate default Bullet collision events but do call up to the simulator for every avatar. Reduces overhead. Objects added to collision list only if they are processing collisions. Reduces overhead especially for large numbers of avatars. Generalize call for water height to GetWaterHeightAtXYZ(). Catch and correct exception getting terrain height when out of bounds. Correct race condition in Terrain Manager where creation wasn't at taint-time. Add API calls for constructing compound shapes. Move NeedsMeshing() logic into object class. Reorganize logic for object meshing to reduce rebuilding of meshs/hulls.
| * Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-154-4/+144
| | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
| * For FlotsamAssetCache, always update access times of cached scene assets ↵Justin Clark-Casey (justincc)2012-09-152-27/+17
| | | | | | | | | | | | | | | | before looking for files to expire. This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed. The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced. This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.