aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-154-229/+155
|\
| * 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 fal...Justin Clark-Casey (justincc)2012-03-151-9/+3
| * 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 multiple...Justin Clark-Casey (justincc)2012-03-152-20/+10
| * Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ...Justin Clark-Casey (justincc)2012-03-152-4/+15
* | Allow llTeleportAgent to teleport gods when not in god modeMelanie2012-03-141-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-149-59/+126
|\ \ | |/
| * 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
| * | Teleports: bounce off repeated requests of teleporting the same agent. Some s...Diva Canto2012-03-131-0/+13
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-132-0/+5
| |\ \ | | |/
| | * Add max thread and min thread information to "xengine status" region console ...Justin Clark-Casey (justincc)2012-03-122-0/+5
| * | Datasnapshot: added "secret" to the registration/deregistration query so that...Diva Canto2012-03-132-33/+28
| |/
| * DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the cap...Diva Canto2012-03-121-2/+2
| * Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
* | Implement llSetPrimitiveParams for physics shape and material. AddMelanie2012-03-134-0/+77
* | Hook up the new cap to the SOP changesMelanie2012-03-131-8/+5
* | Merge branch 'ubitwork'Melanie2012-03-136-33/+310
|\ \
| * | missed commit of extraphysics parameters serialization..UbitUmarov2012-03-131-6/+46
| * | let PhysicsShapeType none remove physics remove physics on child parts **UnT...UbitUmarov2012-03-131-10/+38
| * | bug fixUbitUmarov2012-03-131-2/+2
| * | let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy w...UbitUmarov2012-03-131-1/+1
| * | 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-135-21/+230
* | | | Implement the cap to send extra physics params to the viewer. Not functionalMelanie2012-03-131-0/+38
| |/ / |/| |
* | | 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-135-165/+53
* | Restore duplication of the SL bug where linking phantom to solid lets theMelanie2012-03-121-3/+2
* | 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 also...UbitUmarov2012-03-111-138/+145
* | | 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-118-146/+183
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-118-146/+183
| |\ \
| | * \ Merge branch 'master' into careminsterMelanie2012-03-118-146/+183
| | |\ \ | | | |/
| | | * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr...Justin Clark-Casey (justincc)2012-03-101-1/+1
| | | * minor: In IAR save, log when we start adding the control file rather than say...Justin Clark-Casey (justincc)2012-03-101-2/+3
| | | * minor: rearrange some save oar messages so they say what they're about to do ...Justin Clark-Casey (justincc)2012-03-101-8/+7
| | | * On OAR saving, try fetch assets serially rather than firing all the requests ...Justin Clark-Casey (justincc)2012-03-102-9/+18
| | | * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152