aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2012-09-173-40/+71
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * 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 'avination' into careminsterMelanie2012-09-1618-561/+577
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-147-158/+295
| | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * | Allow setting connection limits, part 2Melanie2012-09-141-0/+20
| | |
| * | Allow some more connections to try to ease lag.Melanie2012-09-142-2/+4
| | |
| * | Wait longer for arrival cofirmation to aid tps into laggy regionsMelanie2012-09-141-2/+2
| | |
| * | Wait a bit longer for new scene presences to aid tps into laggy regionsMelanie2012-09-141-1/+1
| | |
| * | Allow setting max connections for an endpointMelanie2012-09-142-3/+3
| | |
| * | Add a logger so the prior commit will workMelanie2012-09-121-0/+3
| | |
| * | Stop expiry timer when upload is complete. Log if timeout is reached.Melanie2012-09-121-0/+2
| | |
| * | Add a timer to time out upload caps handlers that are not used.Melanie2012-09-121-0/+12
| | |
| * | Add a missing brace, remove a useless temp variable, enable charging.Melanie2012-09-111-6/+3
| | |
| * | report mesh upload costs ( fake values)UbitUmarov2012-09-112-3/+68
| | |
| * | let LLSDAssetUploadRequest include asset_resources information plus letUbitUmarov2012-09-112-1/+11
| | | | | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still)
| * | Removing the variable prica handler again. It's never called, was misnamed andMelanie2012-09-111-332/+0
| | | | | | | | | | | | probably never worked past the mesh beta.
| * | Re-add the module and fix a typoMelanie2012-09-111-0/+332
| | |
| * | Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePriceMelanie2012-09-111-332/+0
| | | | | | | | | | | | which is the name actually used in viewer code.
| * | Add cost calculation suppor tto the VariablePrice one as wellMelanie2012-09-112-9/+44
| | |
| * | Revert "Remove the unused NewFileAgentInventoryVariablePrice module."Melanie2012-09-111-0/+296
| | | | | | | | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e.
| * | Add the option to have variable costing for uploadsMelanie2012-09-112-9/+46
| | |
| * | Remove the unused NewFileAgentInventoryVariablePrice module.Melanie2012-09-111-296/+0
| | |
| * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics toMelanie2012-09-111-81/+117
| | | | | | | | | | | | leverage the Poll Service without blocking it's workers.
* | | Merge branch 'master' into careminsterMelanie2012-09-1645-1320/+2857
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-1531-1233/+2321
| |\ \
| | * | BulletSim: update DLLs and SOs and remove some debugging code.Robert Adams2012-09-151-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-153-4/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-20/+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.
| | * | Added unit tests for multi-region OARsOren Hurvitz2012-09-143-60/+332
| | | |
| | * | Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the ↵Justin Clark-Casey (justincc)2012-09-143-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-OAR patch there is now only one class that handles this operation. Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105 since that did not directly apply
| | * | Support multi-region OAR filesOren Hurvitz2012-09-1414-400/+1080
| | | | | | | | | | | | | | | | Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
| | * | Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID ↵Justin Clark-Casey (justincc)2012-09-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | (present as column PrincipalID) parameters in the Avatars table. These are used to invoke avatar service calls but are not in themselves persistable avatar data.
| * | | More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-153-2/+172
| |/ / | | | | | | | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-134-3/+47
| |\ \
| | * | Documentation of parcel-related eventsSignpostMarv2012-09-131-0/+44
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | correcting a typo that causes c# express to complain about xml comment ↵SignpostMarv2012-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | containing invalid xml Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | Fix usage statement on "debug http" console command since max level is now 5 ↵Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | | | | | | | | | rather than 3
| | * | Fix bug in logging sample input at debug http level 4.Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | | | | | | | | | Also converts newlines to "\n" text.
generated by cgit v1.1 at 2024-12-30 02:29:24 +0000