Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 3 | -6/+33 |
| | | | | | | 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. | ||||
* | More keys for automated ini processing | BlueWall | 2012-07-08 | 1 | -0/+19 |
| | |||||
* | Add more keys for OpenSim.ini.defaults automation | BlueWall | 2012-07-08 | 1 | -4/+18 |
| | |||||
* | Add more automation keys to OpenSim.ini.example | BlueWall | 2012-07-08 | 1 | -6/+34 |
| | |||||
* | 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 | 8 | -58/+107 |
|\ | |||||
| * | Merge branch 'bulletsim2' | Robert Adams | 2012-07-06 | 8 | -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). | ||||
| | * | BulletSim: update the binaries to the current sources | Robert Adams | 2012-07-06 | 4 | -0/+0 |
| | | | |||||
| | * | 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. | ||||
* | minor: add client name to various login service log messages to disambiguate ↵ | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -13/+43 |
| | | | | | | messages from concurrent logins. Also adds destination resolution debug log message showing region endpoint. Adding endpoint to the log helps to find issues where the region external host information has been wrongly configured | ||||
* | regrade osFormatString, osMatchString and osReplaceString to VeryLow. | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -3/+3 |
| | | | | I can't see that these present any real hazard to sim functioning. | ||||
* | minor: Add more information to OSFunctionThreatLevel and clarify some text ↵ | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -6/+9 |
| | | | | in using PARCEL_OWNER, PARCEL_GROUP_MEMBER, ESTATE_MANAGER, ESTATE_OWNER permission categories | ||||
* | porting console commands from raw2sculpt 3.2 | SignpostMarv | 2012-07-05 | 1 | -0/+34 |
| | |||||
* | Add OSSL function osForceAttachToAvatarFromInventory() | Justin Clark-Casey (justincc) | 2012-07-05 | 17 | -51/+340 |
| | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high. | ||||
* | Use GetInventoryItem() in llRezAtRoot rather than iterating through a cloned ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -40/+36 |
| | | | | dictionary | ||||
* | refactor: In llGetNotecardLine() use existing GetInventoryItem() rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -10/+4 |
| | | | | inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe | ||||
* | refactor: In llGetNumberOfNotecardLines() use existing GetInventoryItem() ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -10/+4 |
| | | | | rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe | ||||
* | refactor: use existing GetInventoryItem() in GetScriptByName(), itself ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -13/+9 |
| | | | | renamed from ScriptByName() | ||||
* | refactor: In llGetInventoryType() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -11/+5 |
| | |||||
* | refactor: In llGetInventoryCreator() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -12/+8 |
| | |||||
* | refactor: In llGetInventoryPermMask() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -24/+21 |
| | |||||
* | refactor: in llGetInventoryPermMask use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -23/+19 |
| | |||||
* | refactor: In llRemoteLoadScriptPin() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -20/+5 |
| | |||||
* | refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -22/+11 |
| | | | | GetInventoryItem() | ||||
* | refactor: In llGetInventoryKey() use existing GetInventoryItem() | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -15/+9 |
| | |||||
* | In llMessageLinked() use GetInventoryItems() rather than cloning ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -4/+2 |
| | | | | | | TaskInventory directory GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe | ||||
* | In llRequestInventoryData() use GetInventoryItems() rather than cloning ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -3/+2 |
| | | | | | | TaskInventory directory GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe | ||||
* | refactor: In llCollisionSound() use existing GetInventoryItem() method ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -11/+5 |
| | | | | rather than have it iterate through TaskInventory itself. | ||||
* | refactor: In llRemoveInventory() use existing GetInventoryItem() method ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -14/+9 |
| | | | | rather than have it iterate through TaskInventory itself. | ||||
* | refactor: make llGiveInventory() use existing GetInventoryItem() method ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -24/+11 |
| | | | | rather than iterate through TaskInventory itself. | ||||
* | refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 2 | -5/+5 |
| | | | | to reflect what it actually is |