| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-06-08 | 4 | -25/+25 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| | * | Fix bug with "kick user" reducing agent counts by 2 instead of 1. | Justin Clark-Casey (justincc) | 2012-06-08 | 3 | -22/+24 |
| | | | | | | | | | | | This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close() DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient() | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-06-07 | 8 | -122/+112 |
| |\ \ | |||||
| | * | | Implement playing of the real collision sounds, change scaling for avatar | Melanie | 2012-06-07 | 1 | -133/+57 |
| | | | | | | | | | | | | | | | | collisions to make them really soft because otherwise climbing stairs makes an unbearable amount of noise. | ||||
| | * | | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-07 | 1 | -4/+29 |
| | | | | | | | | | | | | | up the sound pipeline in the viewer. | ||||
| | * | | Make not_at_target stop when the target is reached even if the script | Melanie | 2012-06-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | is not listening to at_target | ||||
| | * | | Typo correction | Melanie | 2012-06-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Disable default collision sounds until they can be uploaded, but enable ↵ | Melanie | 2012-06-07 | 1 | -55/+56 |
| | | | | | | | | | | | | | custom ones | ||||
| | * | | Set collision sound type so custom sound types are recognized | Melanie | 2012-06-07 | 1 | -0/+2 |
| | | | | |||||
| | * | | Make the "delay restart" button delay restart for 1 hour rather than aborting | Melanie | 2012-06-07 | 3 | -31/+61 |
| | | | | | | | | | | | | | it altogether. Allow a maximum of three uses before the restart goes through. | ||||
| | * | | Make timed bans / timed passes work as expected. Prevent transmission of media | Melanie | 2012-06-07 | 2 | -2/+34 |
| | | | | | | | | | | | | | URLs to banned clients. | ||||
| | * | | Prevent a null ref when getting the velocity of an avatar during login or | Melanie | 2012-06-07 | 1 | -2/+3 |
| | | | | | | | | | | | | | logout. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-07 | 9 | -75/+149 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | | Record the fact that child agents can have asset transactions. | Justin Clark-Casey (justincc) | 2012-06-07 | 4 | -32/+26 |
| | | | | | | | | | | | | | Also change code to grab the agent asset transaction module once. | ||||
| | * | | Don't send kill object messages to clients when a child agent is closed. | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -18/+21 |
| | | | | |||||
| | * | | Make change to fix Windows builds | BlueWall | 2012-06-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Log warning if we try to remove a UDP client that has already been removed. | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -0/+6 |
| | | | | |||||
| | * | | Allow the thread watchdog to accept an alarm method that is invoked if the ↵ | Justin Clark-Casey (justincc) | 2012-06-07 | 4 | -25/+96 |
| | | | | | | | | | | | | | | | | | | | | | | timeout is breached. This alarm can then invoke this to log extra information. This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered. | ||||
| * | | | Remove a null ref when an avatar's attachment gets the avatar velocity | Melanie | 2012-06-06 | 1 | -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 meaningless | Melanie | 2012-06-06 | 1 | -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. | Melanie | 2012-06-06 | 1 | -7/+5 |
| | | | | |||||
| * | | | Reverse the logic of a conditional. Clears up a merge artefact. | Melanie | 2012-06-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-06 | 1 | -4/+29 |
| | | | | | | | | | | | | | up the sound pipeline in the viewer. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-06-06 | 9 | -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 velocity | UbitUmarov | 2012-06-05 | 1 | -1/+0 |
| | | | | |||||
| | * | | revert last bad commit but fix recoil direction | UbitUmarov | 2012-06-05 | 1 | -4/+4 |
| | | | | |||||
| | * | | Stop llRezAtRoot() from applying velocity setting impulse in ↵ | UbitUmarov | 2012-06-05 | 1 | -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. | Melanie | 2012-06-05 | 1 | -6/+16 |
| | | | | |||||
| | * | | Actually trigger land collisions in the root even when a child collides | Melanie | 2012-06-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-06-04 | 1 | -3/+3 |
| | |\ \ | |||||
| | | * | | fix addforce/impulse. | UbitUmarov | 2012-06-04 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach ↵ | Melanie | 2012-06-04 | 5 | -9/+27 |
| | |/ / | | | | | | | | | | positions. | ||||
| | * | | When regions are set to shut down the instance, always send notifications to | Melanie | 2012-06-03 | 1 | -6/+30 |
| | | | | | | | | | | | | | all affected regions and disregard the region id parameter. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-06 | 14 | -435/+510 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | 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-06 | 1 | -7/+9 |
| | | | | | | | | | | | | | module | ||||
| | * | | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class ↵ | Justin Clark-Casey (justincc) | 2012-06-06 | 1 | -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-06 | 3 | -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 call | SignpostMarv | 2012-06-06 | 1 | -1/+11 |
| | | | | |||||
| | * | | Ensure closure of bitmap and memory stream with using() statements in ↵ | Justin Clark-Casey (justincc) | 2012-06-06 | 1 | -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-05 | 1 | -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-phantoms | Justin Clark-Casey (justincc) | 2012-06-05 | 1 | -0/+2 |
| | | | | |||||
| | * | | Allow fix-phantoms command to appear even if CombineContiguousRegions = ↵ | Justin Clark-Casey (justincc) | 2012-06-05 | 1 | -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. | Talun | 2012-06-05 | 1 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | 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-05 | 1 | -1/+0 |
| | | | | |||||
| | * | | Scale down per frame MS stats to match scaled simulator FPS stat. | Justin Clark-Casey (justincc) | 2012-06-05 | 1 | -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-05 | 2 | -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/opensim | Justin Clark-Casey (justincc) | 2012-06-05 | 3 | -38/+50 |
| | |\ \ | |||||
| | | * | | Add replaceable region modules to the "show modules" command | BlueWall | 2012-06-04 | 1 | -29/+49 |
| | | | | | |||||
| | | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-06-04 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Correct the delegate specification in EventManager.TriggerTerrainTainted. ↵ | Robert Adams | 2012-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Looks like the wrong one was cut and pasted. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |