aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Remove support for the OS_NPC constant. That one seems to be overly paranoidMelanie2012-07-252-4/+2
| | | | to have and confuses the issue.
* Merge branch 'avination' into careminsterMelanie2012-07-235-42/+81
|\
| * Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+81
| | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | Merge branch 'master' into careminsterMelanie2012-07-230-0/+0
|\ \
| * | Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+82
| | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | Merge branch 'master' into careminsterMelanie2012-07-230-0/+0
|\ \ \ | |/ /
| * | Committing Avination's memleak fix-a-thon, installment #3Melanie2012-07-231-0/+2
| | | | | | | | | | | | | | | | | | When linking, detach the no longer used SOG's from backup so they can be collected. Since their Children collection is never emptied, they prevent their former SOPs from being collected as well.
* | | Merge branch 'avination' into careminsterMelanie2012-07-231-1/+1
|\ \ \ | | |/ | |/|
| * | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| | | | | | | | | | | | if the client told us it wants to log out in the first place.
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'master' into careminsterMelanie2012-07-230-0/+0
|\ \ \ | | |/ | |/|
| * | Committing Avination's memleak fix-a-thon, installment #2Melanie2012-07-231-1/+10
| | | | | | | | | | | | | | | Ensure items coming off the lockless queue are released. Also ensure this is done when the queue is cleared.
| * | Commiting Avination's memleak fix-a-thon, installment #1Melanie2012-07-231-4/+8
| | | | | | | | | | | | | | | As the MinHeap shrinks, free object references that have been sent. Also, free the last item when it empties.
* | | Fix merge issues in prebuildMelanie2012-07-231-33/+33
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-2316-253/+762
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * | Update BulletSim DLLs and SOsRobert Adams2012-07-202-0/+0
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-207-60/+61
| |\ \
| | * | Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled ↵Robert Adams2012-07-201-58/+58
| | | | | | | | | | | | | | | | before BulletSim is
| | * | BulletSim: add reference to OpenSim.Region.CoreModules in BSScene.cs ↵Robert Adams2012-07-206-2/+3
| | | | | | | | | | | | | | | | attempting to fix a mono compile error.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-207-243/+694
| |\ \ \ | | |/ /
| | * | BulletSim: more detail logging for vehicle and general physics debugging.Robert Adams2012-07-204-75/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Physical linksets are fully functional. Tweeking of the vehicle code to make it semi-work. Utilize the new API2 for some setting operations. Add GetOrientation() API call for proper reporting of children of linksets. Changes the interface between C# and C++ code so old DLLs won't work!
| | * | Remove an added but unnecessary dependency in prebuild.xmlRobert Adams2012-07-201-1/+0
| | | |
| | * | BulletSim: fix compile errors from last commit. Clean up passing of physics ↵Robert Adams2012-07-202-15/+14
| | | | | | | | | | | | | | | | scene into vehicle dynamics code.
| | * | BulletSim: Add very detailed logging to BSDynamics for vehicle debuggingRobert Adams2012-07-203-45/+146
| | | |
| | * | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵Robert Adams2012-07-203-1/+163
| | | | | | | | | | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance).
| | * | BulletSim: Add PID variables to physical scene. Not PIDing yet, but soon.Robert Adams2012-07-203-101/+97
| | | | | | | | | | | | | | | | Cleaned up code and got rid of compile warnings.
| | * | BulletSim: Add detailed and voluminous debug logging that is enabledRobert Adams2012-07-202-40/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | with an ini configuration parameter. Correct computation of relative offsets of children in a linkset. Remove a prim from any link relationship before deleting it. Minor code flow cleanups.
| * | | Move RegionConfig.ini.example into bin/Regions/Regions.ini.example - all ↵Justin Clark-Casey (justincc)2012-07-201-4/+8
| |/ / | | | | | | | | | | | | | | | | | | other example files are in the same directory as their real files. Only files ending in .ini and .xml are actually loaded. Also improves the help at the top of Regions.ini.example to mention that OpenSimulator would generate Regions.ini anyway on first startup.
| * | As per opensim-dev mailing list discussion, extend llGetDetectedType() to ↵Justin Clark-Casey (justincc)2012-07-201-5/+28
| | | | | | | | | | | | | | | | | | return OS_NPC if an OS npc is detected. The detection will also return agent is the NPC has been created with the OS_NPC_SENSE_AS_AGENT option.
| * | As per opensim-dev mailing list conversation, introduce OS_NPC constant for ↵Justin Clark-Casey (justincc)2012-07-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | use with llSensor() This same constant will later be used with llGetDetectedType(). This constant has a different name from NPC to avoid possible conflict with future LSL changes. This constant has a different value to try and avoid unnecessary conflict with future constants that may use the same value. Using the 'NPC' constant with llSensor() will remain valid but is deprecated.
* | | Merge branch 'master' into careminsterMelanie2012-07-204-3/+39
|\ \ \ | |/ /
| * | Enables support for UUIDs to be returned in lists fromMic Bowman2012-07-201-3/+13
| | | | | | | | | | | | | | | | | | modInvoke commands. Thanks SignpostMarv!!!
| * | Implements a very useful OSSL function to test a string to seeMic Bowman2012-07-203-0/+26
| | | | | | | | | | | | | | | | | | if it is a UUID. The function is osIsUUID(). Thanks SignpostMarv!
* | | Merge branch 'master' into careminsterMelanie2012-07-201-6/+10
|\ \ \ | |/ /
| * | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
* | | Merge branch 'avination' into careminsterMelanie2012-07-208-155/+202
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-07-192-144/+184
| |\ \
| | * | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-192-144/+183
| | | | | | | | | | | | | | | | back)
| | * | kick gitUbitUmarov2012-07-191-0/+1
| | | |
| * | | Fix slow loading of task inventoryMelanie2012-07-196-11/+18
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-07-2011-202/+272
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | minor: switch around mixed up circuit code and endpoint data in "show ↵Justin Clark-Casey (justincc)2012-07-191-1/+1
| | | | | | | | | | | | connections" region console command
| * | Make LLClientView instant message handling asynchronous rather than ↵Justin Clark-Casey (justincc)2012-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | synchronous to prevent long operations from holding up all inbound packet processing. Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service. Handling this asynchronously instead stops this delay from disrupting all avatars in the scene. This has been shown in OSGrid. I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages. Thanks to Nebadon for testing this change out.
| * | Comment out OnIncomingInstantMessage and OnInstantMessage handlers in ↵Justin Clark-Casey (justincc)2012-07-191-10/+10
| | | | | | | | | | | | GroupsModule, since these led to a private blank method
| * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ↵Justin Clark-Casey (justincc)2012-07-192-23/+7
| | | | | | | | | | | | | | | | | | | | | various places due to race conditions. Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking. The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-07-192-3/+1
| | |
| * | Prevent race conditions between two threads that call LLClientView.Close() ↵Justin Clark-Casey (justincc)2012-07-193-33/+60
| | | | | | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect)
| * | Add TestCreateDuplicateRootScenePresence() regression test.Justin Clark-Casey (justincc)2012-07-193-1/+41
| | |
| * | Add basic TestCreateRootScenePresence() regression testJustin Clark-Casey (justincc)2012-07-191-135/+144
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-1918-169/+247
|\ \ \ | |/ / | | / | |/ |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
generated by cgit v1.1 at 2024-12-25 21:19:54 +0000