aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-161-50/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | | | ** TEST ** put back corrected SetPrimParams for avatars, referenced toUbitUmarov2012-07-161-26/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sitpart and not m_host.
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullphyscisactors have a type water, ground or unknown (default). having this removed geom to name mapping no longer needed. Made some more methods comum to prims and characters acessible via PhysActor allowing for a more uniform access. ...
| * | | | | | | | | | | | | | | remove forgotten line...UbitUmarov2012-07-141-1/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-142-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collision sounds. Let them be passive
* | | | | | | | | | | | | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-172-7/+7
| |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event exceptions to see call path leading up to it.
* | | | | | | | | | | | | | | 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 ↵Justin Clark-Casey (justincc)2012-07-161-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list.
| | * | | | | | | | | | | Stop warning about no session from ViewerStats if user teleports to another ↵Justin Clark-Casey (justincc)2012-07-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region in the same simulator that was not next to the source region. This was because teleporting to the new region invoked the new session setup code before the agent was removed from the old region, which then invoked the session teardown code. Now, we only invoke the teardown code if the region ID occupied by the agent being removed is the same as the one registered for the current session.
| * | | | | | | | | | | | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80.
* | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | | | 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
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | This reverts commit 47f7cc9457bfc5c909290ac189b34dd3eceebe7f.
| * | | | | | Fix a sit rotation issueMelanie2012-07-151-1/+1
| | | | | | |
| * | | | | | Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | This reverts commit e3fa73da96f5612da52d140425f1633494d6edef.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | CN
| * | | | 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
| | |/ / | |/| | | | | | | | | | Who needs accurate collisions when the sim lags and crashes?
| * | | In collisions report linksets root parts to parts, and not all parts.UbitUmarov2012-07-134-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | Temporary suspend collision checks on full stopped bodies, until a better away is found wake them, avoiding spurius collision end and start events. Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Undo figuring gain into spinrate in llTargetOmega. In SL, gain has null effect on nonphysical spinning objects. This reverts commit df55de5b3d88e241f35217d5c08d02b921991513.
| * | | Use faster any contact point collision detection for Volumedetect, plusUbitUmarov2012-07-123-98/+41
| | | | | | | | | | | | | | | | some clean up
| * | | Revert "Add instrumentation to log finalizer being called. Suppressed for ↵Melanie2012-07-122-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
| * | | Revert "Place instrumentation in the proper place. This needs reverting, too!"Melanie2012-07-121-1/+1
| | | | | | | | | | | | | | | | This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6.
| * | | Add "gc collect" console command for debugging memleaksMelanie2012-07-121-0/+7
| | | |
| * | | Place instrumentation in the proper place. This needs reverting, too!Melanie2012-07-111-1/+1
| | | |
| * | | Add instrumentation to log finalizer being called. Suppressed for backupMelanie2012-07-112-6/+12
| | | | | | | | | | | | | | | | | | | | interim copies to avoid spammage. Not for release to the grid, must be reverted first!
| * | | Change order of operations on backup to ensure keyframe motions are backedMelanie2012-07-111-2/+6
| | | | | | | | | | | | | | | | up properly
| * | | be paranoic (?)UbitUmarov2012-07-111-0/+6
| | | |
generated by cgit v1.1 at 2024-12-22 03:15:13 +0000