Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | documentation (OnBackup) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnTerrainTick) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnTerrainTainted) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | documentation (OnClientMovement) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | ||||||
| * | | Documenting some of the events on ↵ | SignpostMarv | 2012-09-11 | 1 | -0/+8 | |
| | | | | | | | | | | | | OpenSim.Region.Framework.Scenes.EventManager (OnFrame) | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 16 | -192/+341 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Remove commented code | Melanie | 2012-09-10 | 1 | -11/+0 | |
| | | | ||||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-10 | 1 | -11/+32 | |
| |\ \ | ||||||
| | * | | webFetchInventory: change control event to simple flag, adjust locking | UbitUmarov | 2012-09-10 | 1 | -11/+32 | |
| | | | | ||||||
| * | | | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before) | Melanie | 2012-09-09 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM | Melanie | 2012-09-09 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly. | |||||
| * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-08 | 4 | -23/+93 | |
| |\ \ \ | | |/ / | ||||||
| | * | | llClientView: try to have only one thread per client processing | UbitUmarov | 2012-09-08 | 1 | -4/+49 | |
| | | | | | | | | | | | | | | | | RegionHandleRequests. (code assumes packet handle is called async as it is not) | |||||
| | * | | One more redundante ParcelProprieties on login | UbitUmarov | 2012-09-07 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | stop sending duplicated parcelProprieties at login | UbitUmarov | 2012-09-07 | 1 | -18/+39 | |
| | | | | ||||||
| | * | | remove fireandforget call to EnableChildAgents at end on CompleteMovement, | UbitUmarov | 2012-09-07 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | since this is already on own thread and its at the end of it. | |||||
| * | | | Set the maximum number of concurrent connections to a service endpoint | Melanie | 2012-09-07 | 1 | -0/+2 | |
| |/ / | | | | | | | | | | | | | to 50. This doesn't work on stock mono but it works in Avination and also under Windoze. | |||||
| * | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | |||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-04 | 4 | -3/+19 | |
| |\ \ | ||||||
| | * | | bug fix | UbitUmarov | 2012-09-04 | 1 | -4/+6 | |
| | | | | ||||||
| | * | | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 3 | -3/+11 | |
| | | | | | | | | | | | | | | | | flight. FS 4.2.2 does not. | |||||
| | * | | let avatar keep flying in tps to same region. (still bad for other | UbitUmarov | 2012-09-04 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | regions ) | |||||
| * | | | Remove debug spam | Melanie | 2012-09-04 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 3 | -97/+113 | |
| | | | | | | | | | | | | | | | | it's own sub-method | |||||
| * | | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are | Melanie | 2012-09-03 | 1 | -14/+17 | |
| |/ / | | | | | | | | | | not yet initialized | |||||
| * | | try to reduce potencial recursive locking | UbitUmarov | 2012-09-01 | 1 | -26/+51 | |
| | | | ||||||
| * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-31 | 3 | -7/+60 | |
| |\ \ | ||||||
| * | | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 3 | -4/+8 | |
| | | | | | | | | | | | | | | | | newgroup information avaiable. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-09-10 | 4 | -6/+8 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | passing in the function name to MOD_Api.ConvertFromLSL for more ↵ | SignpostMarv | 2012-09-10 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | user-friendly error messages | |||||
| * | | | Adjust namespce of FlotsamCache | BlueWall | 2012-09-09 | 2 | -2/+1 | |
| | | | | | | | | | | | | | | | | Place FloatsamCache in the same namespace as our other core asset caches | |||||
| * | | | Revert "Move addin information to CoreModulePlugin.addin.xml" | BlueWall | 2012-09-09 | 3 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ec34580ce3807cede97539488237040e1a8a6cc. Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 13 | -77/+580 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | implementing per-region configuration of limits on the number of prims one ↵ | SignpostMarv | 2012-09-09 | 2 | -0/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵ | SignpostMarv | 2012-09-08 | 5 | -12/+22 | |
| | | | | | | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-08 | 7 | -64/+528 | |
| |\ \ \ | ||||||
| | * | | | BulletSim: Add Bullet body and shape to BSPhysObject and rename | Robert Adams | 2012-09-07 | 6 | -62/+505 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Body' to 'BSBody' for disambiguation when reading code. Complete the API2 interface so nearly all methods on bullet classes are available to the managed code. The efficient single call simulation step is kept in place while all other creation/destruction/parameterization can be done in the managed code. | |||||
| | * | | | BulletSim: Add some comments (gasp) and log messages. | Robert Adams | 2012-09-07 | 4 | -4/+13 | |
| | | | | | ||||||
| | * | | | BulletSim: PhysicsActorType() now returns the correct value rather than ↵ | Robert Adams | 2012-09-07 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | 'unknown'. | |||||
| | * | | | BulletSim: Modify collision flag calls to return the current flags. | Robert Adams | 2012-09-07 | 2 | -7/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track current collision flags in BSPrim. Add BulletSimAPI calls for saving and restoring rigidBodies using construction information structure. | |||||
| * | | | | 4096 is used in various places as the maximum height of a region, ↵ | SignpostMarv | 2012-09-08 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | refactoring to be a constant | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-09-07 | 21 | -65/+596 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs | |||||
| * | | | Move addin attributes to RegionCombinerModule.addin.xml | BlueWall | 2012-09-07 | 2 | -3/+14 | |
| | | | | | | | | | | | | | | | | Will help in automation of setting version info for addin dependencies. | |||||
| * | | | Revert "Move addin information to RegionCombinerModule.addin.xml" | BlueWall | 2012-09-07 | 2 | -15/+3 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8. Need to look into this | |||||
| * | | | Move addin information to RegionCombinerModule.addin.xml | BlueWall | 2012-09-07 | 2 | -3/+15 | |
| | | | | | | | | | | | | | | | | Move addin information from attributes to RegionCombinerModule.addin.xml to aid in automation of addin dependency tracking. | |||||
| * | | | Move addin information to CoreModulePlugin.addin.xml | BlueWall | 2012-09-07 | 3 | -6/+3 | |
| | | | | | | | | | | | | | | | | Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases. | |||||
| * | | | Add warning chevrons around the GC.Collect added to Warp3DImageModule in ↵ | Justin Clark-Casey (justincc) | 2012-09-07 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 5eb2526 Manually calling GC.Collect() really shouldnt' be necessary and is generally regarded as a bad idea. A GC should occur anyway pretty shortly afterwards. However, can leave this in development code for now to see if it does actually make a significant difference rather than simply doing a GC a little earlier. | |||||
| * | | | Add missing DynamicTexture.cs file from last commit | Justin Clark-Casey (justincc) | 2012-09-06 | 1 | -0/+61 | |
| | | | | ||||||
| * | | | If reusing dynamic textures, do not reuse small data length textures that ↵ | Justin Clark-Casey (justincc) | 2012-09-06 | 7 | -46/+181 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false. | |||||
| * | | | adding utility method for getting SceneObjectGroup from scene | SignpostMarv | 2012-09-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> |