aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-084-84/+75
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Don't make duplicate call to ScenePresence.Close() separately in ↵Justin Clark-Casey (justincc)2012-06-084-82/+74
| | | | | | | | | | | | | | ETM.DoTeleport() if an agent needs closing. This is always done as part of Scene.RemoveClient() Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
* | Merge branch 'master' into careminsterMelanie2012-06-084-17/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Go back to calling IncomingCloseAgent() in the "kick user" command for ↵Justin Clark-Casey (justincc)2012-06-082-7/+1
| | | | | | | | | | | | consistency instead of IClientAPI.Close() directly. This no longer double counts child agent removals
| * Remove duplicate update of user count in Scene.IncomingCloseAgent()Justin Clark-Casey (justincc)2012-06-083-14/+27
| | | | | | | | This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
* | Merge branch 'master' into careminsterMelanie2012-06-084-25/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-0859-0/+355
| |\
| | * Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| | |
| * | Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-083-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 careminsterMelanie2012-06-0767-122/+467
|\ \
| * | Implement playing of the real collision sounds, change scaling for avatarMelanie2012-06-071-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 clogsMelanie2012-06-071-4/+29
| | | | | | | | | | | | up the sound pipeline in the viewer.
| * | Add collision sounds to the asset setMelanie2012-06-0759-0/+355
| | |
| * | Make not_at_target stop when the target is reached even if the scriptMelanie2012-06-071-1/+2
| | | | | | | | | | | | is not listening to at_target
| * | Typo correctionMelanie2012-06-071-1/+1
| | |
| * | Disable default collision sounds until they can be uploaded, but enable ↵Melanie2012-06-071-55/+56
| | | | | | | | | | | | custom ones
| * | Set collision sound type so custom sound types are recognizedMelanie2012-06-071-0/+2
| | |
| * | Make the "delay restart" button delay restart for 1 hour rather than abortingMelanie2012-06-073-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 mediaMelanie2012-06-072-2/+34
| | | | | | | | | | | | URLs to banned clients.
| * | Prevent a null ref when getting the velocity of an avatar during login orMelanie2012-06-071-2/+3
| | | | | | | | | | | | logout.
* | | Merge branch 'master' into careminsterMelanie2012-06-0710-75/+150
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Record the fact that child agents can have asset transactions.Justin Clark-Casey (justincc)2012-06-074-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-071-18/+21
| | |
| * | Mantis 6044 Building master currently fails.Talun2012-06-071-0/+1
| | | | | | | | | | | | | | | | | | Add missing reference to System.Core Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| | |
| * | Log warning if we try to remove a UDP client that has already been removed.Justin Clark-Casey (justincc)2012-06-071-0/+6
| | |
| * | Allow the thread watchdog to accept an alarm method that is invoked if the ↵Justin Clark-Casey (justincc)2012-06-074-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 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
| | |
generated by cgit v1.1 at 2024-10-17 06:30:24 +0000