aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-293-0/+28
|\
| * Fix and hook up llTeleportAgentMelanie2012-02-283-1/+7
| |
| * Implement llTeleportAgentMelanie2012-02-281-0/+22
| |
* | chODE: bad meshs get a a basic box or sphere geom with setted prim size. ↵UbitUmarov2012-02-292-503/+148
|/ | | | They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
* 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
| |\
| | * Partially apply the core banlines fixMelanie2012-02-232-6/+9
| | |
| | * Merge branch 'master' into careminsterMelanie2012-02-230-0/+0
| | |\
| | | * Try to resolve some problems with viewers crashing after hitting parcel ↵Justin Clark-Casey (justincc)2012-02-233-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
| * | | Correct sit position calculationsMelanie2012-02-231-2/+2
| |/ /
| * | Fix preserving the animation state of a crossing seated avatarMelanie2012-02-231-2/+10
| | |
| * | Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-232-0/+11
| | | | | | | | | | | | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible
| * | Merge branch 'ubitwork'Melanie2012-02-231-3/+5
| |\ \
* | \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-231-5/+31
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Show avatars as sitting on proot prims only to avoid motion jitterMelanie2012-02-231-5/+31
| | | | | | | | | | | | for passengers
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-2311-31/+94
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-02-238-29/+28
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
generated by cgit v1.1 at 2024-12-27 18:07:16 +0000