aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Change very recent AllowedViewerList and BannedViewerList config setting ↵Justin Clark-Casey (justincc)2012-07-121-4/+4
| | | | | | | names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService] Also changes separator from comma to bar to match existing [LoginService] config features. Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
* Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-122-20/+36
| | | | | Also change to use standard table formatting "show circuits" and "show connections" console commands are very similar but access different data structures.
* Add active status to "show connections"Justin Clark-Casey (justincc)2012-07-121-1/+7
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-122-23/+93
|\
| * Many explanitory comments added to the link and delink code inRobert Adams2012-07-112-23/+93
| | | | | | | | SOG and SOP. Should have no functionality changes.
* | Put output for "show connections" command into standard table format.Justin Clark-Casey (justincc)2012-07-121-19/+16
|/ | | | Also moves into own method.
* Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-1120-80/+51
| | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-113-3/+12
| | | | | This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously. Therefore, this is not yet documented externally.
* Remove WorldComm module from the regression TestCompileAndStartScript() ↵Justin Clark-Casey (justincc)2012-07-111-4/+1
| | | | since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths
* Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-118-32/+150
| | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* Add regression TestRezScriptedAttachmentsFromInventory() though this ↵Justin Clark-Casey (justincc)2012-07-113-23/+85
| | | | currently only checks for the presence of script items, not for started scripts
* If a part has a sit target and an avatar is already sitting, allow another ↵Justin Clark-Casey (justincc)2012-07-101-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-102-5/+6
| | | | and SOP.RemoveSittingAvatar()
* Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-102-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 readabilityJustin Clark-Casey (justincc)2012-07-102-3/+8
|
* refactor: use sit orientation argument passed in to SP.SendSitResponse() ↵Justin Clark-Casey (justincc)2012-07-101-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-102-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-101-1/+1
|
* Disable logging in regression test in OSSL_ApiAttachmentTestsJustin Clark-Casey (justincc)2012-07-101-1/+1
|
* Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵Justin Clark-Casey (justincc)2012-07-102-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-105-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-101-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-094-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 attachmentJustin Clark-Casey (justincc)2012-07-091-0/+9
|
* Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-097-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-071-3/+2
| | | | is only complete for a particular region at a time
* minor: remove some recent mono compiler warningsJustin Clark-Casey (justincc)2012-07-072-3/+1
|
* Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xmlJustin Clark-Casey (justincc)2012-07-071-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 consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
|
* minor: Get RegionReady module to shout initialization complete status to ↵Justin Clark-Casey (justincc)2012-07-071-1/+3
| | | | draw the eye
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-074-58/+107
|\
| * Merge branch 'bulletsim2'Robert Adams2012-07-064-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 toRobert Adams2012-07-064-58/+107
| | | | | | | | | | | | | | | the simulator in batches. More comments.
* | | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-077-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-061-12/+0
| | | | | | | | a few commits ago in 43a2da9
* | minor: Remove some wrong comments in attachments regression testsJustin Clark-Casey (justincc)2012-07-061-2/+0
|/
* Add assert to attachment regression tests to check that number of objects in ↵Justin Clark-Casey (justincc)2012-07-063-5/+38
| | | | the scene graph
* Mantis 6077 trim NPC chat on channel zero.Talun2012-07-061-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.Talun2012-07-066-0/+98
| | | | Allow NPCS to touch obects.
* Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ↵Justin Clark-Casey (justincc)2012-07-061-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-061-29/+38
| | | | AttachObject() for better code comprehension
* Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not setJustin Clark-Casey (justincc)2012-07-061-2/+6
|
* Log warning if time between invocations of the watchdog thread is twice the ↵Justin Clark-Casey (justincc)2012-07-051-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-051-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-051-3/+3
| | | | I can't see that these present any real hazard to sim functioning.
* porting console commands from raw2sculpt 3.2SignpostMarv2012-07-051-0/+34
|
* Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-0517-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-041-40/+36
| | | | dictionary
* refactor: In llGetNotecardLine() use existing GetInventoryItem() rather than ↵Justin Clark-Casey (justincc)2012-07-041-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-041-10/+4
| | | | rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe