aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Prevent double slashes, try #3Melanie2012-09-061-0/+3
| | | |
| * | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| | | | | | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9.
| * | | Merge branch 'ubitwork' into avinationMelanie2012-09-061-6/+8
| |\ \ \
| | * | | Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | | | | | | | | | | | | | | | | | | | Windoze barfs on them.
| | * | | Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
| | * | | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| | | | |
| * | | | Make friend notifies and closing child agents async because both canMelanie2012-09-043-43/+48
| | | | | | | | | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-09-044-3/+19
| |\ \ \ \ | | |/ / /
| | * | | bug fixUbitUmarov2012-09-041-4/+6
| | | | |
| | * | | a forgotten file plus minor changes. Imp and SL viewer seem to preserveUbitUmarov2012-09-043-3/+11
| | | | | | | | | | | | | | | | | | | | flight. FS 4.2.2 does not.
| | * | | let avatar keep flying in tps to same region. (still bad for otherUbitUmarov2012-09-041-0/+6
| | | | | | | | | | | | | | | | | | | | regions )
| * | | | Remove debug spamMelanie2012-09-041-6/+6
| | | | |
| * | | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated intoMelanie2012-09-043-97/+113
| | | | | | | | | | | | | | | | | | | | it's own sub-method
| * | | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics areMelanie2012-09-031-14/+17
| |/ / / | | | | | | | | | | | | not yet initialized
| * | | try to reduce potencial recursive lockingUbitUmarov2012-09-011-26/+51
| | | |
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-08-313-7/+60
| |\ \ \
| * | | | move keyframemotion.copy from sop.copy to sog.copy, where there isUbitUmarov2012-08-303-4/+8
| | | | | | | | | | | | | | | | | | | | newgroup information avaiable.
* | | | | Merge branch 'master' into careminsterMelanie2012-09-104-6/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | passing in the function name to MOD_Api.ConvertFromLSL for more ↵SignpostMarv2012-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | user-friendly error messages
| * | | | Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| | | | | | | | | | | | | | | | | | | | Place FloatsamCache in the same namespace as our other core asset caches
| * | | | Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-093-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 careminsterMelanie2012-09-0916-79/+601
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-093-1/+48
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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. ↵SignpostMarv2012-09-085-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/opensimJustin Clark-Casey (justincc)2012-09-087-64/+528
| |\ \ \
| | * | | BulletSim: Add Bullet body and shape to BSPhysObject and renameRobert Adams2012-09-076-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 Adams2012-09-074-4/+13
| | | | |
| | * | | BulletSim: PhysicsActorType() now returns the correct value rather than ↵Robert Adams2012-09-072-2/+3
| | | | | | | | | | | | | | | | | | | | 'unknown'.
| | * | | BulletSim: Modify collision flag calls to return the current flags.Robert Adams2012-09-072-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, ↵SignpostMarv2012-09-083-3/+4
| |/ / / | | | | | | | | | | | | refactoring to be a constant
* | | | Merge branch 'master' into careminsterMelanie2012-09-0724-73/+667
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * | | Move addin attributes to RegionCombinerModule.addin.xmlBlueWall2012-09-072-3/+14
| | | | | | | | | | | | | | | | Will help in automation of setting version info for addin dependencies.
| * | | Revert "Move addin information to RegionCombinerModule.addin.xml"BlueWall2012-09-072-15/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit ab446bc692782b75fd27105fc3370a16b4fc17d8. Need to look into this
| * | | Move addin information to RegionCombinerModule.addin.xmlBlueWall2012-09-072-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.xmlBlueWall2012-09-073-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-071-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 commitJustin Clark-Casey (justincc)2012-09-061-0/+61
| | | |
| * | | If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-067-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 sceneSignpostMarv2012-09-061-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | adding utility method for getting SceneObjectPart from sceneSignpostMarv2012-09-061-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | pasting in show uptime codeSignpostMarv2012-09-061-0/+41
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-09-063-8/+62
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-061-1/+1
| | |\ \ \
| | * | | | If the GetTexture capability receives a request for a range of data beyond ↵Justin Clark-Casey (justincc)2012-09-063-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable. This is because recent viewers (3.2.1, 3.3.4) and probably earlier ones using the http GetTexture capability will sometimes make such invalid range requests. This appears to happen if the viewer's estimate of texture sizes at discard levels > 0 (chiefly 2) exceeds the total texture size. I believe this does not normally happen but can occur for dynamic textures with are large but mainly blank. If this happens, returning a RequestedRangeNotSatisfiable will cause the viewer to not render the texture at the final resolution. However, returning a PartialContent (or OK) even with 0 data will allow the viewer to render the final texture.
| * | | | | 0006270: Warp3D leaks memory on mono based systemsBlueWall2012-09-061-1/+4
| | |/ / / | |/| | | | | | | | | | | | | Thanks Hiro Lecker for a patch to reduce memory useage with Warp3D map module
| * | | | Enables cast from int to float for MOD* functions;Mic Bowman2012-09-051-1/+1
| |/ / / | | | | | | | | | | | | Thanks SignpostMarv!
| * | | Bump master code up to 0.7.5 now that 0.7.4 is out.Justin Clark-Casey (justincc)2012-09-041-1/+1
| | | |
| * | | wrapping attachment functions in a regionSignpostMarv2012-09-043-2/+4
| | | |
| * | | Implementing functing to send messages directly to attachmentsSignpostMarv2012-09-044-0/+201
| | | |
| * | | refactoring the grunt work of MessageObject into a private method with a ↵SignpostMarv2012-09-041-0/+5
| | | | | | | | | | | | | | | | UUID argument