| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 33 | -305/+891 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | If a part has a sit target and an avatar is already sitting, allow another ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | avatar to sit in the position given if no sit target was set. Previous behave was that the second avatar could not sit. This matches behaviour observed on the LL grid. | ||||
| | * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -5/+6 |
| | | | | | | | | | and SOP.RemoveSittingAvatar() | ||||
| | * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability" | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -8/+3 |
| | | | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly | ||||
| | * | refactor: Add SOP.IsSitTargetOccupied to improve readability | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -3/+8 |
| | | | |||||
| | * | refactor: use sit orientation argument passed in to SP.SendSitResponse() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -4/+2 |
| | | | | | | | | | | | | | rather than creating a new copy There are no issues with side-effects since this is a struct. | ||||
| | * | Move common code to detect whether a part has a valid sit target into a SOP ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -30/+20 |
| | | | | | | | | | | | | | | | property rather than being repeated in SP. This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical. Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero. | ||||
| | * | Remove log line accidentally left in SP.SendSitResponse() | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+1 |
| | | | |||||
| | * | Disable logging in regression test in OSSL_ApiAttachmentTests | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+1 |
| | | | |||||
| | * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -6/+32 |
| | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information | ||||
| | * | When an attachment is detached to inv or derezzed, stop the scripts, update ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 5 | -13/+110 |
| | | | | | | | | | | | | | the known item with script state still in the script engine and then remove the scripts. This is to fix a regression starting from 5301648 where attachments had to start being deleted before persistence in order to avoid race conditions with hud update threads. | ||||
| | * | If a script is being stopped manually, then give the scriptpool thread 1 ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | second to finish normally before forcibly aborting. This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks. This very short grace period is identical to the existing behaviour when a script is removed from the scene. | ||||
| | * | This script allows an object to be attached directly from prim inventory to ↵ | Justin Clark-Casey (justincc) | 2012-07-09 | 4 | -5/+96 |
| | | | | | | | | | | | | | | | another avatar in the scene. Very useful in serious game/environment scenarios where its only allowed for trusted creators. Threat level Severe | ||||
| | * | Don't allow a prim to be sat upon if its part of an attachment | Justin Clark-Casey (justincc) | 2012-07-09 | 1 | -0/+9 |
| | | | |||||
| | * | Do not allow a script to attach a prim if its being sat upon. | Justin Clark-Casey (justincc) | 2012-07-09 | 7 | -26/+229 |
| | | | | | | | | | | | | | This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar. This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar. Recording HashSet is null if there are no sitting avatars in order to save memory. | ||||
| | * | minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init ↵ | Justin Clark-Casey (justincc) | 2012-07-07 | 1 | -3/+2 |
| | | | | | | | | | is only complete for a particular region at a time | ||||
| | * | minor: remove some recent mono compiler warnings | Justin Clark-Casey (justincc) | 2012-07-07 | 2 | -3/+1 |
| | | | |||||
| | * | Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xml | Justin Clark-Casey (justincc) | 2012-07-07 | 1 | -1/+0 |
| | | | | | | | | | | | This was causing 2 copies of the module to be created for each scene. Probably no bad consequences other than a small waste of memory (both for the module and for the warp3D renderer it loaded) | ||||
| | * | minor: Make WORLD MAP category log lines consistent | Justin Clark-Casey (justincc) | 2012-07-07 | 1 | -4/+4 |
| | | | |||||
| | * | minor: Get RegionReady module to shout initialization complete status to ↵ | Justin Clark-Casey (justincc) | 2012-07-07 | 1 | -1/+3 |
| | | | | | | | | | draw the eye | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-07 | 4 | -58/+107 |
| | |\ | |||||
| | | * | Merge branch 'bulletsim2' | Robert Adams | 2012-07-06 | 4 | -58/+107 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Cleanup preceeding major work. No major functional changes. Collisions reported to simulator more efficiently. BulletSim binaries updated using a more recent version of Bullet (v2.80-r2527). | ||||
| | | | * | Clean up collision reporting code so they are properly passed to | Robert Adams | 2012-07-06 | 4 | -58/+107 |
| | | | | | | | | | | | | | | | | | | | | | the simulator in batches. More comments. | ||||
| | * | | | Remove redundant SetScene() function in Scene.AddSceneObject() | Justin Clark-Casey (justincc) | 2012-07-07 | 7 | -29/+34 |
| | |/ / | | | | | | | | | | | | | This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions. | ||||
| | * | | Remove now duplicate interregion object check that should have been removed ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -12/+0 |
| | | | | | | | | | | | | | a few commits ago in 43a2da9 | ||||
| | * | | minor: Remove some wrong comments in attachments regression tests | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -2/+0 |
| | |/ | |||||
| | * | Add assert to attachment regression tests to check that number of objects in ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 3 | -5/+38 |
| | | | | | | | | | the scene graph | ||||
| | * | Mantis 6077 trim NPC chat on channel zero. | Talun | 2012-07-06 | 1 | -0/+8 |
| | | | | | | | | | | | This patch trims leading and trailing spaces from NPC chat and suppresses the sending of empty chat strings on open chat channel 0. | ||||
| | * | Mantis 6063 osNpcTouch. | Talun | 2012-07-06 | 6 | -0/+98 |
| | | | | | | | | | Allow NPCS to touch obects. | ||||
| | * | Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -14/+27 |
| | | | | | | | | | | | | | Scene.AddObject() Only IncomingCreateObject() needs these checks. General object adding does not need to perform crossing perm checks | ||||
| | * | refactor: extract method UpdateUserInventoryWithAttachment() from ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -29/+38 |
| | | | | | | | | | AttachObject() for better code comprehension | ||||
| | * | Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not set | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -2/+6 |
| | | | |||||
| | * | Log warning if time between invocations of the watchdog thread is twice the ↵ | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -2/+22 |
| | | | | | | | | | | | | | timer setting. This is to help detect situations where thread timeout warnings are being generated because of general machine issues rather than deadlock, network or other problems. | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-07-06 | 19 | -117/+587 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | added llSetVelocity. will refuse to work on vehicles and on attachments ( ↵ | UbitUmarov | 2012-07-06 | 4 | -1/+57 |
| | | | | | | | | | | | | | this last may need fix) added also some code for llSetAngularVelocity but not working still | ||||
| | * | | Changed GetTexture error code RequestedRangeNotSatisfiable to NotFound, ↵ | UbitUmarov | 2012-07-06 | 1 | -1/+3 |
| | | | | | | | | | | | | | since viewers don't seem to handle that and keep retrying | ||||
| | * | | Convert the slow request queue into a regular queue and add some cleanup | Melanie | 2012-07-06 | 1 | -4/+18 |
| | | | | | | | | | | | | | and locking. | ||||
| | * | | Fix the boo-boo | Melanie | 2012-07-05 | 1 | -3/+3 |
| | | | | |||||
| | * | | Add an EventType enum and Type field to the poll service event args. This allows | Melanie | 2012-07-05 | 4 | -16/+39 |
| | | | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before. | ||||
| | * | | use the pollEvent timeout paramenter on pooling | UbitUmarov | 2012-07-04 | 1 | -4/+7 |
| | | | | |||||
| | * | | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵ | UbitUmarov | 2012-07-04 | 4 | -5/+8 |
| | | | | | | | | | | | | | it's timeout | ||||
| | * | | *test2* http poll: increased again the pool rate do 10/s but increased ↵ | UbitUmarov | 2012-07-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable | ||||
| | * | | *test* slow http retries pool rate to original 1s | UbitUmarov | 2012-07-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-02 | 3 | -11/+244 |
| | |\ \ | |||||
| | | * | | *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued ↵ | UbitUmarov | 2012-07-01 | 2 | -0/+206 |
| | | | | | | | | | | | | | | | | | to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming. | ||||
| | | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-01 | 2 | -4/+3 |
| | | |\ \ | |||||
| | | * | | | ubitode: create and use 4 off world collision spaces for offworld static prims | UbitUmarov | 2012-06-30 | 1 | -11/+38 |
| | | | | | | |||||
| | * | | | | Implement the buggy version of llXorBase64Strings() for compatibility's sake | Melanie | 2012-07-02 | 1 | -3/+84 |
| | | | | | | |||||
| | * | | | | Bring casing of llSHA1String in line with SL | Melanie | 2012-07-01 | 1 | -1/+1 |
| | | |/ / | |/| | | |||||
| | * | | | Remove spammy debug | Melanie | 2012-06-29 | 1 | -1/+1 |
| | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |