aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-0526-346/+698
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * 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.
| * minor: Add more information to OSFunctionThreatLevel and clarify some text ↵Justin Clark-Casey (justincc)2012-07-051-6/+9
| | | | | | | | in using PARCEL_OWNER, PARCEL_GROUP_MEMBER, ESTATE_MANAGER, ESTATE_OWNER permission categories
| * 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
| * refactor: use existing GetInventoryItem() in GetScriptByName(), itself ↵Justin Clark-Casey (justincc)2012-07-041-13/+9
| | | | | | | | renamed from ScriptByName()
| * refactor: In llGetInventoryType() use existing GetInventoryItem()Justin Clark-Casey (justincc)2012-07-041-11/+5
| |
| * refactor: In llGetInventoryCreator() use existing GetInventoryItem()Justin Clark-Casey (justincc)2012-07-041-12/+8
| |
| * refactor: In llGetInventoryPermMask() use existing GetInventoryItem()Justin Clark-Casey (justincc)2012-07-041-24/+21
| |
| * refactor: in llGetInventoryPermMask use existing GetInventoryItem()Justin Clark-Casey (justincc)2012-07-041-23/+19
| |
| * refactor: In llRemoteLoadScriptPin() use existing GetInventoryItem()Justin Clark-Casey (justincc)2012-07-041-20/+5
| |
| * refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing ↵Justin Clark-Casey (justincc)2012-07-041-22/+11
| | | | | | | | GetInventoryItem()
| * refactor: In llGetInventoryKey() use existing GetInventoryItem()Justin Clark-Casey (justincc)2012-07-041-15/+9
| |
| * In llMessageLinked() use GetInventoryItems() rather than cloning ↵Justin Clark-Casey (justincc)2012-07-041-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-041-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-041-11/+5
| | | | | | | | rather than have it iterate through TaskInventory itself.
| * refactor: In llRemoveInventory() use existing GetInventoryItem() method ↵Justin Clark-Casey (justincc)2012-07-041-14/+9
| | | | | | | | rather than have it iterate through TaskInventory itself.
| * refactor: make llGiveInventory() use existing GetInventoryItem() method ↵Justin Clark-Casey (justincc)2012-07-041-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-042-5/+5
| | | | | | | | to reflect what it actually is
| * Correct spelling mistake m_BanedViewers to m_BannedViewersJustin Clark-Casey (justincc)2012-07-031-4/+4
| |
| * minor: Add some method doc to HasGroupChanged and Schedule ↵Justin Clark-Casey (justincc)2012-07-031-2/+21
| | | | | | | | GroupForFull/PartUpdate() to indicate when region modules need to invoke them
| * Fix issue in database tests where sogs being stored are not in a scene.Justin Clark-Casey (justincc)2012-07-031-1/+1
| | | | | | | | This puts an extra m_part.ParentGroup.Scene == null check at the top of SceneObjectPartInventory.QueryScriptStates()
| * Adds a list of viewers that are allowed or banned from the region.Michelle Argus2012-07-022-0/+82
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2012-07-010-0/+0
|\ \ | |/
| * Add preservation of running state of scripts when drag-copying.Melanie2012-07-014-2/+62
| |
* | Merge branch 'master' into careminsterMelanie2012-07-0112-146/+22
|\ \ | |/
| * Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-307-24/+21
| |
| * Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-305-106/+1
| | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
| * Remove code listed for removal in 0.7.3 that handled script restart for ↵Justin Clark-Casey (justincc)2012-06-301-16/+0
| | | | | | | | incoming attachments from pre-fatpack regions (versions of OpenSimulator more than a year old)
* | Merge branch 'master' into careminsterMelanie2012-06-2913-124/+132
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Move update of the final optional ODE total frame stat inside the OdeLock ↵Justin Clark-Casey (justincc)2012-06-291-3/+3
| | | | | | | | rather than outside to avoid a very occasional race condition with the stat collection thread
| * refactor: rename _collisionEventPrim to m_collisionEventActors and ↵Justin Clark-Casey (justincc)2012-06-291-12/+12
| | | | | | | | | | | | _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. These dictionaries handle all actor types, not just physical prims.
| * Fix a regression where we stopped removing avatars from collision event ↵Justin Clark-Casey (justincc)2012-06-291-1/+1
| | | | | | | | | | | | | | reporting on logout, rather than stopping clearing their collision events. This occurred in b18c8c8 (Thu May 17 2012). This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
| * If a link points to a non-existing item in FetchInventory caps, then don't ↵Justin Clark-Casey (justincc)2012-06-291-1/+2
| | | | | | | | try to add it to the return data rather than suffering an exception later on
| * Add IScene.Name for code clarity to replace the RegionInfo.RegionName used ↵Justin Clark-Casey (justincc)2012-06-294-32/+38
| | | | | | | | in many, many log messages.
| * Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG ↵Justin Clark-Casey (justincc)2012-06-285-52/+58
| | | | | | | | | | | | | | directly instead of an item ID to then shuffle through attachments, saving CPU busywork. Almost all callers already had the sog to hand. Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
| * Rather than iterating through all SOGs in the scene looking for the one that ↵Justin Clark-Casey (justincc)2012-06-281-24/+17
| | | | | | | | matches out fromItemID on detach, go through the agent's attachment sog list instead.
| * Remove code that tried to delete an attachment back to inventory if ↵Justin Clark-Casey (justincc)2012-06-281-6/+1
| | | | | | | | | | | | | | RezSingleAttachmentFromInventoryInternal() returned null. null would only ever be returned if the item couldn't be located within inventory and this would happen immediately. In this case, derezzing wouldn't work anyway since there is no item to derez.
| * If rest of first line after colon is blank then still warn about running in ↵Justin Clark-Casey (justincc)2012-06-281-11/+18
| | | | | | | | | | | | | | XEngine if engine specified does not exist. This is to take account of situations where the user was intending to specify a script engine using colon using its default language. This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
* | Merge branch 'avination' into careminsterMelanie2012-06-2911-46/+94
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Fix llRegionSayTo the right wayMelanie2012-06-284-11/+37
| | |
| * | Return NPC instead of AGENT in the detect parameters for touch, collision andMelanie2012-06-281-0/+2
| | | | | | | | | | | | sensor.
| * | Comment out a spammy message that will spew 4 lines for each request to aMelanie2012-06-271-1/+2
| | | | | | | | | | | | nonexistent URL for http-in
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
| | | | | | | | | | | | when needed rather than once per second. That is just too slow!
| * | Disable physics raycast until it can be seen to. Fix distance calculationMelanie2012-06-261-2/+3
| | | | | | | | | | | | for some results.
| * | Correct a wrong error constantMelanie2012-06-261-1/+1
| | |
generated by cgit v1.1 at 2024-11-16 13:46:10 +0000