Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Shuffle "debug http" levels so that 1 and 2 now cause different levels of ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -4/+5 | |
| | | | | warn to be logged if we receive invalid xml for xmlrpc. | |||||
* | Fix very recent regression in 917d753 where I put the ++updatesThisCall ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -2/+2 | |
| | | | | | | outside the batching part of ProcessEntityUpdates() This stopped any batching happening and since this method is called periodically updates were sent very slowly | |||||
* | If we're going to discard a terse update block because it's now someone ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -2/+4 | |
| | | | | else's hud, then don't still add it to the list of blocks for the update message. | |||||
* | correct wrong incomplete comment from previous commit 3c3ea19 in ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+2 | |
| | | | | AttachmentsModule | |||||
* | Fix a bug where scene objects attached as HUDs through scripts would not ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -0/+13 | |
| | | | | | | disappear for other avatars. We do this by sending a kill message for that object to all other avatars apart from the one that has the hud. | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -4/+29 | |
|\ | ||||||
| * | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-14 | 1 | -4/+29 | |
| | | | | | | | | up the sound pipeline in the viewer. | |||||
* | | Fix a race condition where an object update for a hud could be sent to ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -3/+24 | |
|/ | | | | | | | non-owner avatars if the hud was attached directly from within the region. If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that. This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud. | |||||
* | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 3 | -7/+21 | |
| | | | | | | | | point. HUDs attachment points are private. Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations. This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs. It appears this is no longer true with Neck and Root (Avatar Center) | |||||
* | minor: remove unnecessary IsAttachment = false setting for new object in ↵ | Justin Clark-Casey (justincc) | 2012-06-14 | 1 | -1/+0 | |
| | | | | UploadObjectAssetModule, property always starts as false | |||||
* | minor: refactor part of LLClientView.ProcessEntityUpdates() to remove ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -5/+7 | |
| | | | | duplicate code | |||||
* | Remove long obsolete and unused IClientAPI.KillEndDone() | Justin Clark-Casey (justincc) | 2012-06-13 | 3 | -13/+0 | |
| | ||||||
* | Add ObjectUpdate as one of the packets that can be screened out when setting ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -1/+2 | |
| | | | | debug packet level | |||||
* | In the osGetGrid functions, if the [GridInfo] section does not exist then ↵ | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -1/+6 | |
| | | | | return "Configuration Error", as already happens if there is no GridInfoURI | |||||
* | Committing the Avination implementation of llCastRay. This is a complete rewrite | Melanie | 2012-06-13 | 1 | -100/+345 | |
| | | | | wich does it's thing independently of physics. Enjoy! | |||||
* | Add variable timer configureation for the timer_Script | BlueWall | 2012-06-12 | 1 | -1/+6 | |
| | | | | Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60. | |||||
* | Remove accidental timeout left in during earlier debugging. Has been in ↵ | Justin Clark-Casey (justincc) | 2012-06-12 | 1 | -1/+1 | |
| | | | | since two commits ago (b099f26) | |||||
* | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵ | Justin Clark-Casey (justincc) | 2012-06-12 | 4 | -49/+29 | |
| | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc. | |||||
* | Set IClientAPI.IsActive = false early on client removal due to ack timeout ↵ | Justin Clark-Casey (justincc) | 2012-06-12 | 1 | -29/+35 | |
| | | | | | | | | rather than using IsLoggingOut flag. IsActive is more appropriate since unack timeout is not due to voluntary logout. This is in line with operations such as manual kick that do not set the IsLoggingOut flag. It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick). | |||||
* | If the simulator closes a root agent due to ack timeout, then send the ↵ | Justin Clark-Casey (justincc) | 2012-06-12 | 1 | -2/+20 | |
| | | | | client a kick message with that reason, in case it is somehow still listening. | |||||
* | In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already ↵ | Justin Clark-Casey (justincc) | 2012-06-12 | 3 | -18/+6 | |
| | | | | available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes. | |||||
* | Comment out the scene presence sitting debug log messages for now | Justin Clark-Casey (justincc) | 2012-06-11 | 1 | -6/+6 | |
| | ||||||
* | Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in ↵ | Justin Clark-Casey (justincc) | 2012-06-11 | 1 | -3956/+3978 | |
| | | | | | | | | LSL where these aren't evaluated propertly." This reverts commit a8a9d13dc07bc9e23ebf439cbea5ece6ae002315. Accidentally committed, this patch might not be the correct approach. | |||||
* | Add last frame time monitor to MonitorModule now that this value is useful | Justin Clark-Casey (justincc) | 2012-06-11 | 1 | -0/+8 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-06-11 | 3 | -0/+106 | |
|\ | ||||||
| * | Commitig the Avination implementation of llTeleportAgent and | Melanie | 2012-06-11 | 3 | -0/+106 | |
| | | | | | | | | | | | | llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like their SL counterparts because that permission is not yet understood by TPVs based on v1.x. | |||||
* | | Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL ↵ | Justin Clark-Casey (justincc) | 2012-06-09 | 1 | -3978/+3956 | |
|/ | | | | | | where these aren't evaluated propertly. Addresses http://opensimulator.org/mantis/view.php?id=3268 | |||||
* | Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -0/+2 | |
| | | | | json stats from working | |||||
* | Stop sending a DisableSimulator packet in LLClientView.Close(), which is a ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -4/+0 | |
| | | | | | | duplicate for child agents and unnecessary for root agents. Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents. | |||||
* | Instead of retrieving the known client again in LLUDPServer.RemoveClient(), ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -21/+10 | |
| | | | | | | check the IsLoggingOut flag instead. This is slightly better thread-race wise | |||||
* | If logging a client out due to ack timeout, do this asynchronously rather ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 2 | -10/+20 | |
| | | | | | | | than synchronously on the outgoing packet loop. This is the same async behaviour as normal logouts. This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages. | |||||
* | Add regression test for client logout due to ack timeout. | Justin Clark-Casey (justincc) | 2012-06-08 | 4 | -93/+103 | |
| | ||||||
* | Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 1 | -8/+1 | |
| | | | | nor client are ever null. | |||||
* | Store already retrieve IClientAPI in IncomingPacket structure for later use ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 2 | -15/+16 | |
| | | | | | | rather than doing another retrieve on dequeue. Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state. | |||||
* | Don't make duplicate call to ScenePresence.Close() separately in ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 4 | -82/+74 | |
| | | | | | | | ETM.DoTeleport() if an agent needs closing. This is always done as part of Scene.RemoveClient() Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems. | |||||
* | Go back to calling IncomingCloseAgent() in the "kick user" command for ↵ | Justin Clark-Casey (justincc) | 2012-06-08 | 2 | -7/+1 | |
| | | | | | | consistency instead of IClientAPI.Close() directly. This no longer double counts child agent removals | |||||
* | Remove duplicate update of user count in Scene.IncomingCloseAgent() | Justin Clark-Casey (justincc) | 2012-06-08 | 3 | -14/+27 | |
| | | | | This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling. | |||||
* | Fix bug with "kick user" reducing agent counts by 2 instead of 1. | Justin Clark-Casey (justincc) | 2012-06-08 | 3 | -22/+24 | |
| | | | | | This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close() DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient() | |||||
* | Record the fact that child agents can have asset transactions. | Justin Clark-Casey (justincc) | 2012-06-07 | 4 | -32/+26 | |
| | | | | Also change code to grab the agent asset transaction module once. | |||||
* | Don't send kill object messages to clients when a child agent is closed. | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -18/+21 | |
| | ||||||
* | Log warning if we try to remove a UDP client that has already been removed. | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -0/+6 | |
| | ||||||
* | Allow the thread watchdog to accept an alarm method that is invoked if the ↵ | Justin Clark-Casey (justincc) | 2012-06-07 | 2 | -8/+71 | |
| | | | | | | | timeout is breached. This alarm can then invoke this to log extra information. This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered. | |||||
* | minor: Change log messages on Warp3DImageModule to show they are from this ↵ | Justin Clark-Casey (justincc) | 2012-06-06 | 1 | -7/+9 | |
| | | | | module | |||||
* | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class ↵ | Justin Clark-Casey (justincc) | 2012-06-06 | 1 | -0/+0 | |
| | | | | name and make it easier to distinguish between map image modules. | |||||
* | Actively dispose of Bitmaps in Warp3D image module and world map module once ↵ | Justin Clark-Casey (justincc) | 2012-06-06 | 3 | -215/+248 | |
| | | | | | | we've finished with them. This might help with memory leakage issues though I suspect it won't. | |||||
* | enabling all corners of a sim to be set in one call | SignpostMarv | 2012-06-06 | 1 | -1/+11 | |
| | ||||||
* | Ensure closure of bitmap and memory stream with using() statements in ↵ | Justin Clark-Casey (justincc) | 2012-06-06 | 1 | -7/+8 | |
| | | | | | | WorldViewModule. If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default) | |||||
* | Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen ↵ | Justin Clark-Casey (justincc) | 2012-06-05 | 1 | -2/+0 | |
| | | | | | | | file when loaded from a stream. Fixes a bug introduced 2 weeks ago in 67ebe80 Thanks to Plugh for pointing this out. | |||||
* | minor: Add user feedback when executing fix-phantoms | Justin Clark-Casey (justincc) | 2012-06-05 | 1 | -0/+2 | |
| | ||||||
* | Allow fix-phantoms command to appear even if CombineContiguousRegions = ↵ | Justin Clark-Casey (justincc) | 2012-06-05 | 1 | -13/+11 | |
| | | | | | | | | false, since this allows one to go back from a megaregion to normal regions. Adapted from a patch by Garmin Kawaguichi in http://opensimulator.org/mantis/view.php?id=6027 Garmin says that fix-phantoms allows one to reset objects when going back from megaregion to normal regions as well as the othe rway around. Thanks! |