Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Stop the 15 second initial script compile wait if a script is being rezzed ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -0/+4 | |
| | | | | | | | | on a previously empty region. | |||||
| * | Fix bug where region ready would be triggered a second time if a script was ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -30/+23 | |
| | | | | | | | | | | | | rezzed on a previously script-free region. There is no need to listen for OnRezScript in RegionReadyModule since OnEmptyScriptCompileQueue will only fire if scripts were compiled. | |||||
| * | Fix bug where region ready was being triggered twice in quick succession if ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -9/+12 | |
| | | | | | | | | a region contained no scripts. | |||||
| * | Establish EventManager.OnRegionReady event. This will only be triggerred ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 4 | -11/+39 | |
| | | | | | | | | | | | | once when the region is ready. Switch MapImageServiceModule to use this. | |||||
| * | Pass entire scene object in OnLoginsEnabled event rather than just the ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 4 | -24/+22 | |
| | | | | | | | | | | | | region name. This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2012-07-18 | 13 | -139/+111 | |
| | |\ | ||||||
| | * | | Missing parameter in log error message was throwing exception | Dan Lake | 2012-07-18 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Only listen to LoginsEnabled event in RegionReadyModule if it has been asked ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -26/+22 | |
| | |/ | |/| | | | | | | | to disable logins until all scripts have been compiled | |||||
| * | | 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. | |||||
* | | | | 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 | |
|\ \ \ \ | ||||||
| * | | | | fix PollServiceRequestManager | UbitUmarov | 2012-07-17 | 1 | -10/+47 | |
| | | | | | ||||||
| * | | | | 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 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 3 | -10/+4 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 7 | -83/+13 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 353 | -8014/+16547 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | UbitOde: remove useless water collider from active code. | UbitUmarov | 2012-07-17 | 1 | -8/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-16 | 1 | -50/+35 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | | | | | | | | ** TEST ** put back corrected SetPrimParams for avatars, referenced to | UbitUmarov | 2012-07-16 | 1 | -26/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sitpart and not m_host. | |||||
| * | | | | | | | | backkick git | UbitUmarov | 2012-07-15 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | just a kick git | UbitUmarov | 2012-07-15 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 1 | -24/+28 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 1 | -3/+20 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 1 | -0/+34 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 1 | -45/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 2 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-15 | 3 | -6/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | messing around... Let terrain and water have nullphysicsactors, let | UbitUmarov | 2012-07-15 | 6 | -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... | UbitUmarov | 2012-07-14 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | don't subscribe collision events for nonphysical parts only because of | UbitUmarov | 2012-07-14 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collision sounds. Let them be passive | |||||
* | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | | | | | | | | | | Fix merge artefacts | Melanie | 2012-07-17 | 3 | -10/+4 | |
| |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | | | | | | Stop warning about no session from ViewerStats if user teleports to another ↵ | Justin Clark-Casey (justincc) | 2012-07-16 | 1 | -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" | Melanie | 2012-07-16 | 6 | -53/+0 | |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80. |