| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 11 | -202/+272 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | minor: switch around mixed up circuit code and endpoint data in "show ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -1/+1 |
| | | | | | | | | | connections" region console command | ||||
| | * | Make LLClientView instant message handling asynchronous rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | synchronous to prevent long operations from holding up all inbound packet processing. Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service. Handling this asynchronously instead stops this delay from disrupting all avatars in the scene. This has been shown in OSGrid. I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages. Thanks to Nebadon for testing this change out. | ||||
| | * | Comment out OnIncomingInstantMessage and OnInstantMessage handlers in ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -10/+10 |
| | | | | | | | | | GroupsModule, since these led to a private blank method | ||||
| | * | Stop explicitly closing and nulling out Animator in order to prevent NREs in ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 2 | -23/+7 |
| | | | | | | | | | | | | | | | various places due to race conditions. Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking. The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved. | ||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-07-19 | 2 | -3/+1 |
| | | | |||||
| | * | Prevent race conditions between two threads that call LLClientView.Close() ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 3 | -33/+60 |
| | | | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect) | ||||
| | * | Add TestCreateDuplicateRootScenePresence() regression test. | Justin Clark-Casey (justincc) | 2012-07-19 | 3 | -1/+41 |
| | | | |||||
| | * | Add basic TestCreateRootScenePresence() regression test | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -135/+144 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-19 | 18 | -169/+247 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| | * | Add EventManager.OnRegionLoginsStatusChange fired whenever logins are ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 8 | -25/+47 |
| | | | | | | | | | | | | | | | enabled or disabled at any point, not just during initial startup. This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled and was affected by a bug where it would never fire if the region started with logins disabled. | ||||
| | * | Add back notification to neighbouring regions when RegionReadyModule is not ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -0/+3 |
| | | | | | | | | | active accidentally just removed in 528004d | ||||
| | * | Perform other region ready actions even if simulator is configured to leave ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 4 | -47/+48 |
| | | | | | | | | | logins disabled on startup. | ||||
| | * | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |