Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Close() the ScenePresence after we've removed it from the scene graph, to ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2012-07-17 | 2 | -6/+24 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-17 | 2 | -6/+24 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Make the scrpt running flag work properly | Melanie | 2012-07-17 | 2 | -6/+24 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Revert "Revert "refactor: make llGiveInventory() use existing ↵ | Justin Clark-Casey (justincc) | 2012-07-17 | 1 | -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-17 | 3 | -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-17 | 1 | -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-17 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2012-07-17 | 6 | -53/+0 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Stop sending the viewer an inventory create message if a known attachment ↵ | Justin Clark-Casey (justincc) | 2012-07-17 | 1 | -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 ubitwork | ubit | 2012-08-01 | 2 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-07-31 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Correct StandUp position and rotation | Melanie | 2012-07-30 | 1 | -1/+3 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | Reverse a senseless change in the prioritizer. Why I would want avatars to ↵ | Melanie | 2012-07-31 | 1 | -3/+9 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | render according to their camera position is beyond me. | |||||
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-30 | 4 | -8/+15 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Return world rotation on llGetObjectDetails()'s OBJECT_ROT | Melanie | 2012-07-29 | 1 | -4/+10 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix an exception while outputting a log message | Melanie | 2012-07-29 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | When controls are released by script, don't drop the permission to | Melanie | 2012-07-29 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retake them. | |||||
| * | | | | | | | | See that if controls are taken, those are released before taking new ones | Melanie | 2012-07-29 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Bump number of URLs to 15000 per region | Melanie | 2012-07-29 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-28 | 8 | -44/+139 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Implement the linefeed URL hack for ShoutCast and other services | Melanie | 2012-07-27 | 1 | -0/+53 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Change the stair fudge factor so steps of 0.5m can be climbled to match ↵ | Melanie | 2012-07-27 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inworldz claims and SL's realities | |||||
| * | | | | | | | | Allow load and save of IAR without a password. The password must still be | Melanie | 2012-07-24 | 1 | -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 per | Melanie | 2012-07-23 | 5 | -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 ubitwork | ubit | 2012-07-23 | 8 | -18/+29 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix double-ping on logout by not sending a stop packet to the client | Melanie | 2012-07-21 | 1 | -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 serialized | Melanie | 2012-07-20 | 1 | -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 avination | Melanie | 2012-07-19 | 2 | -144/+184 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Fix slow loading of task inventory | Melanie | 2012-07-19 | 6 | -11/+18 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-19 | 4 | -161/+227 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Update ubitMesh primMesher with new Dahlia version on core ( reckick git | UbitUmarov | 2012-07-19 | 2 | -144/+183 | |
| | | | | | | | | | | | | | | | | | | | | | | | | back) | |||||
| * | | | | | kick git | UbitUmarov | 2012-07-19 | 1 | -0/+1 | |
| |/ / / / | ||||||
| * | | | | Fix llSameGroup to work according to specs | Melanie | 2012-07-18 | 1 | -10/+36 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-17 | 11 | -457/+393 | |
| |\ \ \ \ | ||||||
| * | | | | | Replace PollServiceRequestManager with older version, add extra logging to | Melanie | 2012-07-17 | 2 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | event exceptions to see call path leading up to it. | |||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 1 | -10/+47 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | fix PollServiceRequestManager | UbitUmarov | 2012-07-17 | 1 | -10/+47 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 3 | -50/+69 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | minor changes, removed extra parts physics updates on linking nonroot | UbitUmarov | 2012-07-17 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | prims | |||||
| * | | | | | fix our stats ( old schema ) | UbitUmarov | 2012-07-17 | 2 | -48/+66 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 3 | -10/+4 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 3 | -10/+4 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Fix merge artefacts | Melanie | 2012-07-17 | 3 | -10/+4 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 7 | -83/+13 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 7 | -83/+13 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 7 | -83/+13 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-07-16 | 1 | -30/+13 | |
| | | |\ \ \ | | | | |/ / | ||||||
| | | | * | | refactor: factor out common code in WebStatsModule.OnMakeRootAgent() | Justin Clark-Casey (justincc) | 2012-07-16 | 1 | -8/+7 | |
| | | | | | | ||||||
| | | | * | | In WebStatsModule.OnMakeRootAgent(), get region ID directly from ↵ | Justin Clark-Casey (justincc) | 2012-07-16 | 1 | -18/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list. |