aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Revert "Revert "More hacking around viewer bug""Diva Canto2012-03-151-1/+1
| * | These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, ne...Diva Canto2012-03-151-1/+13
| * | Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
| * | Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-154-225/+158
| |\ \ | | |/
| * | More hacking around viewer bugDiva Canto2012-03-151-1/+1
| * | Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
* | | Merge branch 'ubitwork'Melanie2012-03-1513-21/+276
|\ \ \
| * | | Playing with object costs CAPS ...UbitUmarov2012-03-151-2/+118
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-151-1/+1
| |\ \ \
| * | | | added ObjectPhysicsProperties http event message to send viewer that data. F...UbitUmarov2012-03-1510-1/+76
| * | | | bug fixs, added a default physics shape estimator based on being a mesh or no...UbitUmarov2012-03-144-18/+82
* | | | | 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-1414-70/+147
|\ \ | |/
| * 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
| * | 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
| | * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-124-4/+9
| * | 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-138-34/+361
|\ \
| * | 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-137-22/+281
* | | | 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-136-165/+133
* | 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