aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | Close() the ScenePresence after we've removed it from the scene graph, to ↵Justin Clark-Casey (justincc)2012-07-181-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cut down race conditions when another thread manages the grab the presence after some SP structures have been reset.
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-172-6/+24
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ 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.
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-012-4/+12
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Reverse a senseless change in the prioritizer. Why I would want avatars to ↵Melanie2012-07-311-3/+9
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | render according to their camera position is beyond me.
* | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-304-8/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Return world rotation on llGetObjectDetails()'s OBJECT_ROTMelanie2012-07-291-4/+10
| | | | | | | | |
| * | | | | | | | Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| | | | | | | | |
| * | | | | | | | When controls are released by script, don't drop the permission toMelanie2012-07-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retake them.
| * | | | | | | | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
| | | | | | | | |
| * | | | | | | | Bump number of URLs to 15000 per regionMelanie2012-07-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-288-44/+139
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Implement the linefeed URL hack for ShoutCast and other servicesMelanie2012-07-271-0/+53
| | | | | | | | |
| * | | | | | | | Change the stair fudge factor so steps of 0.5m can be climbled to match ↵Melanie2012-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inworldz claims and SL's realities
| * | | | | | | | Allow load and save of IAR without a password. The password must still beMelanie2012-07-241-0/+3
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present on the command line for compatibility, but is ignored. Avination's IAR operations are administratively done and the staff doesn't have the passwords of the users.
| * | | | | | | Change attachment handling to remove object from the scene first as perMelanie2012-07-235-42/+81
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | justincc's original work. Sample scripts before doing so. Also refactor some crucial common code and eliminate parameters that were only ever used with the same constant value.
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-238-18/+29
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix double-ping on logout by not sending a stop packet to the clientMelanie2012-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | if the client told us it wants to log out in the first place.
| * | | | | | Fix the order of operations on detach. The object must always be serializedMelanie2012-07-201-6/+10
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | while still in the scene to avoid losing important script state. DeleteSceneObject can not be called before doing this!
| * | | | | Merge branch 'ubitwork' into avinationMelanie2012-07-192-144/+184
| |\ \ \ \ \
| * | | | | | Fix slow loading of task inventoryMelanie2012-07-196-11/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-194-161/+227
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update ubitMesh primMesher with new Dahlia version on core ( reckick gitUbitUmarov2012-07-192-144/+183
| | | | | | | | | | | | | | | | | | | | | | | | back)
| * | | | | kick gitUbitUmarov2012-07-191-0/+1
| |/ / / /
| * | | | Fix llSameGroup to work according to specsMelanie2012-07-181-10/+36
| | | | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-07-1711-457/+393
| |\ \ \ \
| * | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-172-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | event exceptions to see call path leading up to it.
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-171-10/+47
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
| | | | | |
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-173-50/+69
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-173-10/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix merge artefactsMelanie2012-07-173-10/+4
| | | | | |
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-177-83/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-177-83/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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.