Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-10-17 | 3 | -11/+25 |
|\ | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs | ||||
| * | minor: Make BasicCircuitTests.SetUp() call overriden base method instead of ↵ | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+2 |
| | | | | | | | | ignoring it. | ||||
| * | Add LastMemoryChurn stat using existing data so we can more quickly tell how ↵ | Justin Clark-Casey (justincc) | 2012-10-16 | 2 | -2/+14 |
| | | | | | | | | memory churn changes rather than waiting for the average to move. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-17 | 4 | -31/+136 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| * | Add optional pool for the UDPPacketBuffer objects that handle all incoming ↵ | Justin Clark-Casey (justincc) | 2012-10-16 | 4 | -25/+130 |
| | | | | | | | | | | | | | | | | UDP data. Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle. This option pools those objects. This reduces memory churn. Currently off by default. Works but the scope can be expanded. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 2 | -31/+129 |
|\ \ | |/ | |||||
| * | Make it possible to separate start and stop lludp packet processing from the ↵ | Justin Clark-Casey (justincc) | 2012-10-16 | 2 | -31/+129 |
| | | | | | | | | | | | | | | console for debug processes. This is controlled via the "debug lludp start <in|out|all>" and "debug lludp stop <in|out|all>" region console commands. The command "debug lludp status" will show current status. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 8 | -24/+57 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | ||||
| * | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | |||||
| * | Add missing category paremeter to llGiveInventoryList grid IM construction. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | | | | | | | | | This was a regression from 16c9c1df Sat Oct 6 02:34:49 2012 +0100. Should resolve http://opensimulator.org/mantis/view.php?id=6360 | ||||
| * | minor: Add missing newlines and spacing to help for "debug eq" console command | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -4/+4 |
| | | |||||
| * | minor: Add/correct some doc messages associated with entity teleport. | Justin Clark-Casey (justincc) | 2012-10-16 | 2 | -3/+9 |
| | | | | | | | | | | | | I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context - viewer still requests it though possibly only after TeleportFinish(). However, we will continue to send it. | ||||
| * | minor: comment out "Registered seed capability" message for "Received SEED ↵ | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -4/+5 |
| | | | | | | | | | | | | caps request" message for now. I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region). | ||||
| * | minor: Comment out the region console caps message for now. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | |||||
| * | minor: Fix and elaborate on log information printed when an unrecognized ↵ | Justin Clark-Casey (justincc) | 2012-10-13 | 1 | -2/+14 |
| | | | | | | | | estate method is received from the client. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-13 | 1 | -1/+2 |
| |\ | |||||
| * | | Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only ↵ | Justin Clark-Casey (justincc) | 2012-10-13 | 1 | -19/+25 |
| | | | | | | | | | | | | | | | | | | performing HG regionflags service check if the region secret is not empty. An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret. | ||||
| * | | Now using region flags for llRequestSimulatorData DATA_SIM_POS. | TBG Renfold | 2012-10-13 | 1 | -8/+17 |
| | | | | | | | | | | | | | | | | | | If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID. Just a temporary fix at this time. | ||||
* | | | Fix a merge issue | Melanie | 2012-10-12 | 1 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 50 | -663/+1304 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | | BulletSim: only use native sphere shape if it is a sphere. | Robert Adams | 2012-10-12 | 1 | -1/+2 |
| |/ | |||||
| * | Get rid of accidental scene start left in ScenePresenceAutopilotTests | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -1/+0 |
| | | |||||
| * | Fix problems with regression tests by allowing invoke of Update() with a ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 2 | -3/+5 |
| | | | | | | | | finite number of frames even if the scene isn't active. | ||||
| * | Get Watchdog to log thread removal | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -1/+19 |
| | | |||||
| * | Add "active true|false" to "debug scene" console command. | Justin Clark-Casey (justincc) | 2012-10-12 | 2 | -6/+47 |
| | | | | | | | | This allows the scene update and maintenance loops to be started and stopped for debug purposes. | ||||
| * | minor: Use && instead of & when deciding whether to print ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | Improve/ObjectUpdate packet out messages when debug is turned on. Practical effect is probably none. | ||||
| * | minor: Fix bug in categorization of blocks reused stat from packetpool | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -1/+1 |
| | | |||||
| * | Remove now unnecessary OpenSim.Framework.Console reference from Monitoring. | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -1/+0 |
| | | | | | | | | Properly resolve circular reference which no longer appeared in Mono build as there were no using statements for it. | ||||
| * | Add AgentUpdate to PacketPool. This is the most common inbound packet from ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 3 | -5/+28 |
| | | | | | | | | viewers. | ||||
| * | BulletSim: fix problem with some shapes (like cylinders) being implemented ↵ | Robert Adams | 2012-10-11 | 1 | -1/+1 |
| | | | | | | | | as cubes. | ||||
| * | minor: Comment out "Client requested range for texture ... but" message. ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -3/+3 |
| | | | | | | | | This is not useful during normal operation. | ||||
| * | Fix percentage stats to multiply by 100. Adjust container name for ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 2 | -4/+4 |
| | | | | | | | | packetpool stats. | ||||
| * | Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 1 | -1/+3 |
| | | | | | | | | Packetpool code. | ||||
| * | Fix build break by moving OpenSim.Framework.Console back below HttpServer in ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 2 | -29/+28 |
| | | | | | | | | | | | | the build order. Luckily, it turns out Framework.Monitoring doesn't need to reference Console directly. | ||||
| * | Fix packetpool for ImprovedTerseObjectUpdate packets. | Justin Clark-Casey (justincc) | 2012-10-11 | 4 | -8/+28 |
| | | | | | | | | | | These were neither being returned or in many places reused. Getting packets from a pool rather than deallocating and reallocating reduces memory churn which in turn reduces garbage collection time and frequency. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-11 | 15 | -203/+348 |
| |\ | |||||
| | * | BulletSim: update the DLLs and SOs | Robert Adams | 2012-10-11 | 4 | -0/+0 |
| | | | |||||
| | * | BulletSim: remove some unused API2 calls because they were removed from ↵ | Robert Adams | 2012-10-11 | 2 | -14/+2 |
| | | | | | | | | | | | | Bullet 2.81 | ||||
| | * | BulletSim: normalize physics FPS to 45 (for real this time). | Robert Adams | 2012-10-11 | 1 | -2/+2 |
| | | | |||||
| | * | BulletSim: normalize physics FPS to 45. | Robert Adams | 2012-10-11 | 1 | -3/+4 |
| | | | |||||
| | * | BulletSim: Use full linkset mass when computing vehicle gravity force. Add ↵ | Robert Adams | 2012-10-11 | 3 | -11/+16 |
| | | | | | | | | | | | | taint-time specification to new AddForce(). | ||||
| | * | BulletSim: Change defaults for constraint CFM and ERP to make large linksets ↵ | Robert Adams | 2012-10-11 | 2 | -11/+8 |
| | | | | | | | | | | | | more rigid. Remove mass calculation for terrain (it should stay a static object). | ||||
| | * | BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to ↵ | Robert Adams | 2012-10-11 | 7 | -52/+74 |
| | | | | | | | | | | | | improve interactions. | ||||
| | * | BulletSim: Add Force* operations to objects to allow direct push to engine. | Robert Adams | 2012-10-11 | 7 | -29/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update BSDynamics to use same (don't want to delay updates til next taint-time. Suppress queuing a taint update for position and orientation calls if value does not change. Move Bullet timing statistics call from C# back to C++ code. Throttle taints per simulation step and add parameter to set. By default, don't create hulls for physical objects. Add a parameter to turn on and off. | ||||
| | * | BulletSim: Fix crash when linking large physical linksets. | Robert Adams | 2012-10-11 | 8 | -102/+132 |
| | | | | | | | | | | | | | | | | | | | | | | | | Properly remove and restore linkage constraints when upgrading a prim's mesh to a hull. Lots more debug logging. Definitions and use of Bullet structure dumping. Centralize detail logging so a Flush() can be added for debugging. | ||||
| | * | Updated Robust.HG.ini.example. Thanks Austin Tate. | Diva Canto | 2012-10-11 | 1 | -1/+32 |
| | | | |||||
| * | | Extend "show stats" command to "show stats [list|all|<category name>]" | Justin Clark-Casey (justincc) | 2012-10-11 | 6 | -144/+307 |
| |/ | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool. | ||||
| * | Assign endVector before control leaves ↵ | Justin Clark-Casey (justincc) | 2012-10-11 | 1 | -0/+2 |
| | | | | | | | | | | | | ObjectCommandsModule.TryParseVectorRange() in order to fix mono 2.4.3 compile failure. This doesn't fail the compile on mono 2.10.8. | ||||
| * | Add "delete object pos <start-coord> to <end-coord>" console command. | Justin Clark-Casey (justincc) | 2012-10-10 | 2 | -26/+87 |
| | | | | | | | | | | This allows one to delete objects within a certain volume. See help on console for more details. | ||||
| * | Correct osSetContentType() threat check to query osSetContentType rather ↵ | Justin Clark-Casey (justincc) | 2012-10-10 | 1 | -1/+3 |
| | | | | | | | | than osSetResponseType |