aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
| | | | | | | |
| * | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-231-5/+31
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-046-4/+53
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * | | | | | | | Add WebProfiles config to other config exampleBlueWall2012-03-041-0/+3
| | | | | | | | |
| * | | | | | | | 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-0228-317/+275
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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-2544-121/+300
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v3_supportBlueWall2012-02-2211-48/+32
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | V3 SupportBlueWall2012-02-223-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
| * | | | | | | | | | | | Add web profile url setting to iniBlueWall2012-02-211-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | V3 Support:BlueWall2012-02-212-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
* | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-0328-321/+274
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | | | | | | | | Remove outdated comment about checking attachment prims in ↵Justin Clark-Casey (justincc)2012-03-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript()
| * | | | | | | | | | | | Allow a script to receive events if its root prim is in an area where it's ↵Justin Clark-Casey (justincc)2012-03-021-4/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion!