aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-0424-697/+1338
|\ \
| * | Zero velocity when drag-copyingMelanie2012-03-041-0/+2
| * | This still causes terrain artefactsMelanie2012-03-021-3/+3
| * | This still causes terrain artefactsMelanie2012-03-021-3/+1
| * | 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
| * | Let inworld meshs colide as such and not as basic prim all the time. Removed...UbitUmarov2012-02-272-5/+10
| * | Merge branch 'ubitwork'Melanie2012-02-274-568/+378
| |\ \
| | * | update ubitODE to my current working stateUbitUmarov2012-02-274-568/+378
| * | | 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 d...UbitUmarov2012-02-262-3/+41
| | * | Implement KeyframedMotion selection behaviorMelanie2012-02-263-2/+37
| * | | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-262-0/+18
| * | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-268-41/+75
| * | | Implement proper selection behaviorMelanie2012-02-263-2/+37
| |/ /
| * | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-265-11/+9
| * | Fix an infinite recursion caused by checking the wrong values forMelanie2012-02-261-24/+27
| * | 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 Bu...UbitUmarov2012-02-253-35/+98
| * | | 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
| * | 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
| * | | Add a cache on GridService requestsMelanie2012-02-241-0/+10
| |/ /
| * | stop using useless geom tricallback.UbitUmarov2012-02-241-1/+2
| * | 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
* | | | Merge branch 'master' into careminsterMelanie2012-03-044-4/+44
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of /home/opensim/var/repo/opensim into v3_supportBlueWall2012-03-042-8/+3
| |\ \ \
| | * | | comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| * | | | OpenID auth needs hashing before authenticatingBlueWall2012-03-022-2/+2
| * | | | Merge branch 'master' into v3_supportBlueWall2012-03-0222-317/+256
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of /home/opensim/src/opensim into v3_supportBlueWall2012-02-291-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2521-103/+276
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into v3_supportBlueWall2012-02-2211-48/+32
| |\ \ \ \ \ \ \
| * | | | | | | | V3 SupportBlueWall2012-02-222-2/+22
| * | | | | | | | V3 Support:BlueWall2012-02-212-2/+22
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-0322-321/+255
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo...Justin Clark-Casey (justincc)2012-03-021-3/+1