aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-154-229/+155
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-152-170/+115
| |
| * Simplify some logic in the ScriptInstance constructor - running is set to ↵Justin Clark-Casey (justincc)2012-03-151-9/+3
| | | | | | | | false in both if/else branches
| * minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12
| |
| * Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11
| |
| * Fix a problem where multiple near simultaneous calls to llDie() from ↵Justin Clark-Casey (justincc)2012-03-152-20/+10
| | | | | | | | | | | | | | | | | | | | multiple scripts in the same linkset can cause unnecessary thread aborts. The first llDie() could lock Scene.m_deleting_scene_object. The second llDie() would then wait at this lock. The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away. Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead. This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
| * Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ↵Justin Clark-Casey (justincc)2012-03-152-4/+15
| | | | | | | | | | | | | | | | | | | | to release locks, resulting in a crippled simulator. This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well. It has been seen to happen when llDie() is called in a linkset running more than one script. Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete. Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time. Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
* | Allow llTeleportAgent to teleport gods when not in god modeMelanie2012-03-141-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-1414-70/+147
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-133-25/+50
| |\
| | * refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ↵Justin Clark-Casey (justincc)2012-03-143-25/+50
| | | | | | | | | | | | | | | | | | it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event) Also add other various illustrative comments
| * | Teleports: bounce off repeated requests of teleporting the same agent. Some ↵Diva Canto2012-03-131-0/+13
| | | | | | | | | | | | scripts do that, and that fails the whole thing.
| * | Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-136-4/+14
| |\ \ | | |/
| | * Add max thread and min thread information to "xengine status" region console ↵Justin Clark-Casey (justincc)2012-03-122-0/+5
| | | | | | | | | | | | command
| | * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-124-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
| * | Datasnapshot: added "secret" to the registration/deregistration query so ↵Diva Canto2012-03-132-33/+28
| |/ | | | | | | that data providers can verify authenticity if they want.
| * DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the ↵Diva Canto2012-03-121-2/+2
| | | | | | | | capitalization of 'name' to lower case, also in the same <grid> section.
| * Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
| |
* | Implement llSetPrimitiveParams for physics shape and material. AddMelanie2012-03-134-0/+77
| | | | | | | | llSetPhysicsMaterial support.
* | Hook up the new cap to the SOP changesMelanie2012-03-131-8/+5
| |
* | Merge branch 'ubitwork'Melanie2012-03-138-34/+361
|\ \
| * | missed commit of extraphysics parameters serialization..UbitUmarov2012-03-131-6/+46
| | |
| * | let PhysicsShapeType none remove physics remove physics on child parts ↵UbitUmarov2012-03-131-10/+38
| | | | | | | | | | | | **UnTested**
| * | bug fixUbitUmarov2012-03-131-2/+2
| | |
| * | let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy ↵UbitUmarov2012-03-131-1/+1
| | | | | | | | | | | | with it disabled...
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-131-2/+2
| |\ \
| * | | initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵UbitUmarov2012-03-137-22/+281
| | | | | | | | | | | | | | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
* | | | Implement the cap to send extra physics params to the viewer. Not functionalMelanie2012-03-131-0/+38
| |/ / |/| | | | | | | | yet because the parameters are not actually stored anywhere yet.
* | | Ensure child prims of a phantom prim are marked as phantomMelanie2012-03-131-2/+2
|/ /
* | Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-136-165/+133
| | | | | | | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type!
* | Restore duplication of the SL bug where linking phantom to solid lets theMelanie2012-03-121-3/+2
| | | | | | | | child prim remain phantom
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-03-124-16/+68
|\ \
| * | allocate UndoRedoStore only on demandUbitUmarov2012-03-121-10/+17
| | |
| * | ubitode prim select was not doing phantom caseUbitUmarov2012-03-121-6/+17
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-121-0/+33
| |\ \
| | * | Allow RLV to redirect received folders to #RLV folderMelanie2012-03-111-0/+33
| | | |
| * | | missing file in ubitODEUbitUmarov2012-03-121-0/+1
| | | |
* | | | Add AVATAR_MALE flag to return values of llGetAgentInfoMelanie2012-03-122-0/+6
|/ / /
* | | ubitOde also knows a bit more about physical phantomUbitUmarov2012-03-111-29/+142
| | |
* | | Physical phantoms testable with chOde. Volume detection was changed and ↵UbitUmarov2012-03-111-138/+145
| | | | | | | | | | | | also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
* | | bug fix (??) in sog copy()UbitUmarov2012-03-111-10/+19
| | |
* | | more phantom physics ( chODE and a fix in manager physicsactorUbitUmarov2012-03-112-62/+121
| | |
* | | initial steps to support physical phantomsUbitUmarov2012-03-116-13/+73
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-1110-147/+275
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-1110-147/+275
| |\ \
| | * \ Merge branch 'master' into careminsterMelanie2012-03-1110-147/+275
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-109-111/+236
| | | |\
| | | | * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate ↵Justin Clark-Casey (justincc)2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread. This was previous behaviour anyway.
| | | | * minor: In IAR save, log when we start adding the control file rather than ↵Justin Clark-Casey (justincc)2012-03-101-2/+3
| | | | | | | | | | | | | | | | | | | | saying afterwards that we added it.
generated by cgit v1.1 at 2024-12-24 10:50:10 +0000