aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-064-10/+42
|\ | | | | | | careminster
| * Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9
| | | | | | | | Don't allow NPC creation unless the prim owner has rez rights.
| * Teleport users to the cornfield when they are teleported withMelanie2012-03-051-3/+13
| | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs.
| * llListSort SL compatibility: When sorting strided list and the listMelanie2012-03-051-2/+5
| | | | | | | | | | | | length is not a multiple of the stride, return the original list. Also, enforce that sort is ascending only when the ascending parameter is 1, and not when it is != 0
| * SL compatibility - return only points on segemtn, not ray in llCastRayMelanie2012-03-051-0/+5
| |
| * A stab at making llEjectFromLand work in all casesMelanie2012-03-051-3/+10
| |
* | Merge branch 'master' into careminsterMelanie2012-03-064-7/+169
|\ \
| * | Updates to MSSQL store for 0.7.3 to include:Chris Hart2012-03-064-7/+169
| | | | | | | | | | | | | | | | | | * Telehub support * Bugfix to Friends lookups * Updates to Creator fields to store up to 255 characters for HG item creator storage
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0424-697/+1338
|\ \ \ | | |/ | |/| | | | careminster
| * | Zero velocity when drag-copyingMelanie2012-03-041-0/+2
| | |
| * | This still causes terrain artefactsMelanie2012-03-021-3/+3
| | | | | | | | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648.
| * | This still causes terrain artefactsMelanie2012-03-021-3/+1
| | | | | | | | | | | | | | | | | | Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1." This reverts commit 15bc539bd49e7a09c1ec6e539871cde5eee6032e.
| * | Fix and hook up llTeleportAgentMelanie2012-02-283-1/+7
| | |
| * | Implement llTeleportAgentMelanie2012-02-281-0/+22
| | |
| * | made box a little largerUbitUmarov2012-02-281-6/+6
| | |
| * | A few blind changes to go try to go around bad mesh little box replacement failUbitUmarov2012-02-281-67/+50
| | |
| * | Really dirty hack to make sims start. Causes errors but the ting runs. RemoveMelanie2012-02-281-1/+5
| | | | | | | | | | | | when fixed right.
| * | Let inworld meshs colide as such and not as basic prim all the time. ↵UbitUmarov2012-02-272-5/+10
| | | | | | | | | | | | Removed also LOD, and outerskin on colision meshs.
| * | Merge branch 'ubitwork'Melanie2012-02-274-568/+378
| |\ \
| | * | update ubitODE to my current working stateUbitUmarov2012-02-274-568/+378
| | | |
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-2710-41/+93
| | |\ \
| | * \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-261-1/+1
| | |\ \ \
| * | | | | Fix vehicles going physical stopping llTargetOmega parts (boat radar)Melanie2012-02-271-3/+5
| | | | | |
| * | | | | Fix NPC appearance setting to include attachments againMelanie2012-02-271-1/+4
| | |_|/ / | |/| | |
| * | | | Merge branch 'ubitwork'Melanie2012-02-262-3/+41
| |\ \ \ \ | | |/ / /
| | * | | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵UbitUmarov2012-02-262-3/+41
| | | | | | | | | | | | | | | | | | | | data.
| * | | | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-262-0/+18
| | | | | | | | | | | | | | | | | | | | periodically.
| * | | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-268-41/+75
| | |/ / | |/| | | | | | | | | | other way because SOG doesn't technically exist in the DB
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-260-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
| | * | Implement KeyframedMotion selection behaviorMelanie2012-02-263-2/+37
| | | |
| * | | Implement proper selection behaviorMelanie2012-02-263-2/+37
| |/ /
| * | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-265-11/+9
| | | | | | | | | | | | code.
| * | Fix an infinite recursion caused by checking the wrong values forMelanie2012-02-261-24/+27
| | | | | | | | | | | | Buoyancy, Force and Torque
| * | Serialize Keyframe motion for region crossingsMelanie2012-02-264-4/+96
| | |
| * | Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
| | |
| * | Merge branch 'ubitwork'Melanie2012-02-263-35/+98
| |\ \
| | * | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵UbitUmarov2012-02-253-35/+98
| | | | | | | | | | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-252-8/+12
| | |\ \
| | * \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-242-1/+12
| | |\ \ \
| * | | | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-269-2/+493
| | |_|/ / | |/| | |
| * | | | Delay the sending of the initial werables update until the inventory andMelanie2012-02-252-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login
| * | | | Merge branch 'ubitwork'Melanie2012-02-241-5/+21
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | replace bad meshs by a small cube and log it.UbitUmarov2012-02-241-5/+21
| | | |
| * | | Try not to send the avatar updates on login. This may mean loggin in withMelanie2012-02-241-1/+2
| | | | | | | | | | | | | | | | invisible attachments again but could help the appearance issues.
| * | | Add a cache on GridService requestsMelanie2012-02-241-0/+10
| |/ /
| * | stop using useless geom tricallback.UbitUmarov2012-02-241-1/+2
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-244-11/+33
| |\ \
| | * | Prevent a nullref when nonphysical motion objects cross sim boundariesMelanie2012-02-231-1/+1
| | | |
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-232-6/+9
| | |\ \
| | * | | Correct sit position calculationsMelanie2012-02-231-2/+2
| | | | |