aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-172-6/+24
| | |\ \
| | | * | Make the scrpt running flag work properlyMelanie2012-07-172-6/+24
| | | | |
| * | | | Revert "Revert "refactor: make llGiveInventory() use existing ↵Justin Clark-Casey (justincc)2012-07-171-24/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetInventoryItem() method rather than iterate through TaskInventory itself."" This reverts commit 59a29f5f221a1ffe4e22c63ef9da82270442b213. The original revert was committed by mistake - it turns out this was not the cause of Mantis 6089 Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Fix regression where llGiveInventory() had stopped asking non-owner ↵Justin Clark-Casey (justincc)2012-07-173-38/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receivers to accept/decline. This appears to be a regression from back in commit db91044 (Mon Aug 22 2011) where we started to send TaskInventoryOffered msg dialog rather than InventoryOffered dialog. This is probably correct, but failed because the bucket was too large and because we wouldn't have handled the TaskInventoryDeclined option anyway. This patch handles both of these and make llGiveInventoryList() use TaskInventoryOffered as well Fixes http://opensimulator.org/mantis/view.php?id=6089
| * | | Revert "refactor: make llGiveInventory() use existing GetInventoryItem() ↵Justin Clark-Casey (justincc)2012-07-171-11/+24
| |/ / | | | | | | | | | | | | | | | method rather than iterate through TaskInventory itself." This reverts commit 58b13d51a7eddb442e38e6dc6790a9e7cf68bad7.
| * | Restore update of inventory item on derez/logout. This is necessary to ↵Justin Clark-Casey (justincc)2012-07-171-1/+6
| | | | | | | | | | | | | | | | | | | | | update the name if this has been changed whilst attached. Note, this behaviour appears to be at variance with the ll grid as of Tues 17 July 2012, testing with viewer 3.2.1. The item name in inventory does not change either at the point of detach or after a relog.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-176-53/+0
| |\ \
| * | | Stop sending the viewer an inventory create message if a known attachment ↵Justin Clark-Casey (justincc)2012-07-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | item is updated. This doesn't seem to make any sense and probably stems from a period when this code was directly involved in attaching objects directly from the scene. This message is already being sent by InventoryAccessModule code instead.
* | | | Fix llSameGroup to work according to specsMelanie2012-07-181-10/+36
| | | |
* | | | 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
| | | | | | | | | | | | | | | | | | | | prims
| * | | | 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-17381-8330/+17075
| |\ \ \ \ \ \
| * | | | | | | UbitOde: remove useless water collider from active code.UbitUmarov2012-07-171-8/+8
| | | | | | | |
| * | | | | | | 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
| | |_|/ / | |/| | |
generated by cgit v1.1 at 2024-12-18 18:05:15 +0000