aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Remove a null ref when an avatar's attachment gets the avatar velocityMelanie2012-06-061-4/+3
| | | | | | while the avatar is logging in or out. Also remove some unlocking calls without matching locking call. Merge artefact cleanup, again.
* Remove useless logging of a bare-names stack trace. It's meaninglessMelanie2012-06-061-32/+57
| | | | | | to a non-programmer and insufficient for a programmer. Add commented debug output and data collection to troubleshoot future locking issues.
* Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
|
* Reverse the logic of a conditional. Clears up a merge artefact.Melanie2012-06-061-1/+1
|
* Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-061-4/+29
| | | | up the sound pipeline in the viewer.
* Merge branch 'avination' into careminsterMelanie2012-06-069-35/+87
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| |
| * revert last bad commit but fix recoil directionUbitUmarov2012-06-051-4/+4
| |
| * Stop llRezAtRoot() from applying velocity setting impulse in ↵UbitUmarov2012-06-051-2/+3
| | | | | | | | World.RezObject, doing it only in itself, so its applyed after resuming scripts etc. It was giving twice the requested velocity.
| * Fix land collisions to work like SL.Melanie2012-06-051-6/+16
| |
| * Actually trigger land collisions in the root even when a child collidesMelanie2012-06-041-1/+1
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-06-041-3/+3
| |\
| | * fix addforce/impulse.UbitUmarov2012-06-041-3/+3
| | |
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵Melanie2012-06-045-9/+27
| |/ | | | | | | positions.
| * When regions are set to shut down the instance, always send notifications toMelanie2012-06-031-6/+30
| | | | | | | | all affected regions and disregard the region id parameter.
* | Merge branch 'master' into careminsterMelanie2012-06-0617-441/+523
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | minor: Change log messages on Warp3DImageModule to show they are from this ↵Justin Clark-Casey (justincc)2012-06-061-7/+9
| | | | | | | | | | | | module
| * | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class ↵Justin Clark-Casey (justincc)2012-06-061-0/+0
| | | | | | | | | | | | name and make it easier to distinguish between map image modules.
| * | Actively dispose of Bitmaps in Warp3D image module and world map module once ↵Justin Clark-Casey (justincc)2012-06-063-215/+248
| | | | | | | | | | | | | | | | | | we've finished with them. This might help with memory leakage issues though I suspect it won't.
| * | enabling all corners of a sim to be set in one callSignpostMarv2012-06-061-1/+11
| | |
| * | Ensure closure of bitmap and memory stream with using() statements in ↵Justin Clark-Casey (justincc)2012-06-061-7/+8
| | | | | | | | | | | | | | | | | | WorldViewModule. If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
| * | Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen ↵Justin Clark-Casey (justincc)2012-06-051-2/+0
| | | | | | | | | | | | | | | | | | | | | file when loaded from a stream. Fixes a bug introduced 2 weeks ago in 67ebe80 Thanks to Plugh for pointing this out.
| * | minor: Add user feedback when executing fix-phantomsJustin Clark-Casey (justincc)2012-06-051-0/+2
| | |
| * | Allow fix-phantoms command to appear even if CombineContiguousRegions = ↵Justin Clark-Casey (justincc)2012-06-051-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | false, since this allows one to go back from a megaregion to normal regions. Adapted from a patch by Garmin Kawaguichi in http://opensimulator.org/mantis/view.php?id=6027 Garmin says that fix-phantoms allows one to reset objects when going back from megaregion to normal regions as well as the othe rway around. Thanks!
| * | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-052-3/+28
| | | | | | | | | | | | | | | | | | The packet was actually being handled but not acted on. This change extends the default timeout for paused clients to 5 minutes and makes both the paused and non-paused timeout periods configurable.
| * | Remove unused ScenePresence list structure in llGetAgentList()Justin Clark-Casey (justincc)2012-06-051-1/+0
| | |
| * | Scale down per frame MS stats to match scaled simulator FPS stat.Justin Clark-Casey (justincc)2012-06-051-1/+1
| | | | | | | | | | | | | | | This makes frame time stats properly tally with fps, which saves confusion and makes it easier to interpret numbers. In some ways this is not so artifical - physics FPS runs at the higher rate.
| * | Start sending spare frame time MS viewer stat. Make frame time correctly ↵Justin Clark-Casey (justincc)2012-06-052-78/+124
| | | | | | | | | | | | | | | | | | | | | display total frame time, not just non-spare time. This makes it easier to see when components of frame time exceed normal permitted frame time. Currently reflect scene frame times.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-055-44/+50
| |\ \
| | * | Add replaceable region modules to the "show modules" commandBlueWall2012-06-041-29/+49
| | | |
| | * | Remove profile from basic configurationMelanie2012-06-042-6/+0
| | | |
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-06-041-1/+1
| | |\ \
| | | * | Correct the delegate specification in EventManager.TriggerTerrainTainted. ↵Robert Adams2012-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | Looks like the wrong one was cut and pasted.
| | * | | Remove the "Profile" config as it's covered by the replaceable interfaceMelanie2012-06-041-8/+0
| | |/ /
| * | | Properly show per frame millisecond statistics per frame, not as amount of ↵Justin Clark-Casey (justincc)2012-06-041-22/+41
| |/ / | | | | | | | | | | | | | | | | | | time taken per second. This is to make these statistics actually match their names (and also be more accurate as number of frames can vary under heavy load) Currently using scene frames (11.23 every second) instead of physics frames (56.18 per second)
* | | Merge branch 'master' into careminsterMelanie2012-06-034-78/+83
|\ \ \ | |/ /
| * | Fix build break whree accidentally did inv.Folders rather than ↵Justin Clark-Casey (justincc)2012-06-021-1/+1
| | | | | | | | | | | | inv.Folders.Count in a minor change.
| * | minor: tidy up some commentsJustin Clark-Casey (justincc)2012-06-021-4/+2
| | |
| * | Fix various issues with http inventoryJustin Clark-Casey (justincc)2012-06-024-78/+85
| | | | | | | | | | | | | | | | | | | | | | | | 1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
* | | Merge branch 'avination' into careminsterMelanie2012-06-024-34/+63
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-012-8/+34
| | |
| * | Fix impersonation, it got broken in a mergeMelanie2012-06-011-7/+10
| | |
| * | Remove the kill record. Core has removed it long ago and it really does more ↵Melanie2012-06-011-19/+19
| | | | | | | | | | | | harm than good these days
* | | Merge branch 'master' into careminsterMelanie2012-06-023-93/+270
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Instead of updating sim stats root agent, child, objects and scripts ↵Justin Clark-Casey (justincc)2012-06-012-33/+14
| | | | | | | | | | | | accounts every single scene frame, update in the once every 3 seconds SimStatsReporter run
| * | Add optional total avatars, total prims and active prims stats to ODE plugin.Justin Clark-Casey (justincc)2012-06-011-0/+21
| | | | | | | | | | | | | | | These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims
| * | If OdeScene.Near() returns no collision contacts, then exit as early as ↵Justin Clark-Casey (justincc)2012-06-011-0/+4
| | | | | | | | | | | | possible. All subsequent code is only relevant if there are contacts.
| * | Add optional stat for the other collision time per frame not spent in ODE ↵Justin Clark-Casey (justincc)2012-06-011-1/+16
| | | | | | | | | | | | native spaces or geom collision code
| * | Add avatar forces calculation, prim force and raycasting per frame ↵Justin Clark-Casey (justincc)2012-06-011-7/+46
| | | | | | | | | | | | millisecond optional stats
| * | Collection optional avatar and prim taint frame millisecond timesJustin Clark-Casey (justincc)2012-06-011-7/+36
| | |
generated by cgit v1.1 at 2024-10-17 18:26:07 +0000