aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' into avinationMelanie2012-07-1711-457/+393
|\
| * fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
| * minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| * fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
| * Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\
| * \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-177-83/+13
| |\ \
| * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-17353-8014/+16547
| |\ \ \
| * | | | UbitOde: remove useless water collider from active code.UbitUmarov2012-07-171-8/+8
| * | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-161-50/+35
| |\ \ \ \
| * | | | | ** TEST ** put back corrected SetPrimParams for avatars, referenced toUbitUmarov2012-07-161-26/+48
| * | | | | backkick gitUbitUmarov2012-07-151-1/+0
| * | | | | just a kick gitUbitUmarov2012-07-151-0/+1
| * | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-151-24/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-151-3/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-151-0/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-151-45/+26
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-152-3/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-151-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-153-6/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | messing around... Let terrain and water have nullphysicsactors, letUbitUmarov2012-07-156-388/+268
| * | | | | | | | | | | | remove forgotten line...UbitUmarov2012-07-141-1/+0
| * | | | | | | | | | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-142-1/+2
* | | | | | | | | | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-172-7/+7
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Fix merge artefactsMelanie2012-07-173-10/+4
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-167-83/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-07-161-30/+13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | refactor: factor out common code in WebStatsModule.OnMakeRootAgent()Justin Clark-Casey (justincc)2012-07-161-8/+7
| | * | | | | | | | | | In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.Reg...Justin Clark-Casey (justincc)2012-07-161-18/+2
| | * | | | | | | | | | Stop warning about no session from ViewerStats if user teleports to another r...Justin Clark-Casey (justincc)2012-07-161-6/+6
| * | | | | | | | | | | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Allow setting linked avatar positions from within a prim not the one sat onMelanie2012-07-161-11/+18
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Testing changes and instrumentationMelanie2012-07-151-3/+20
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Save packets received while the client is added and replay them later.Melanie2012-07-151-0/+34
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Reinstate older set rotation code for avatars since it works in all casesMelanie2012-07-151-22/+1
| * | | | | | Replace sit position and rotation code with older, working versionMelanie2012-07-151-26/+28
| * | | | | | Revert "Fix a sit rotation issue"Melanie2012-07-151-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Fix a sit rotation issueMelanie2012-07-151-1/+1
| * | | | | Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| | |_|_|/ | |/| | |
| * | | | Experimentally handle UseCircuitCode synchrnonouslyMelanie2012-07-151-1/+2
| | |_|/ | |/| |
| * | | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| * | | Make https work in the poll service managerMelanie2012-07-151-2/+2
| * | | Fix a double parenthesis typoMelanie2012-07-151-1/+1
| * | | Set up https to work like http does in the poll handlerMelanie2012-07-151-3/+3
| * | | Reinstate sleeping because less CPU is preferred over reporting accuracy.Melanie2012-07-141-1/+1
| | |/ | |/|
| * | In collisions report linksets root parts to parts, and not all parts.UbitUmarov2012-07-134-41/+45
| * | missed fix on vehicle reference frameUbitUmarov2012-07-131-2/+1
| * | fix bad vehicle reference frameUbitUmarov2012-07-131-1/+2
| * | Revert " lltargetomega efective spinrate now multiplied by gain ( need check )"Melanie2012-07-131-1/+0