aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
|\
| * minor: If logging full incoming HTTP data, don't deceptively print ... at ↵Justin Clark-Casey (justincc)2012-11-201-2/+5
| | | | | | | | the end of the body.
* | Merge branch 'avination' into careminsterMelanie2012-11-201-0/+2
|\ \
| * | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+2
| | | | | | | | | | | | * Last step is to flip the throttle distribution.
| * | Revert "Merge master into teravuswork", it should have been avination, not ↵teravus2012-11-1531-1808/+639
| | | | | | | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
| * | Merge master into teravusworkteravus2012-11-1531-639/+1808
| |\ \
* | \ \ Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
| * | | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
| | | | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
* | | | Merge branch 'avination' into careminsterMelanie2012-11-171-1/+1
|\ \ \ \ | |/ / /
| * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-1/+1
| | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
| * | | Add AnimState to CADUMelanie2012-10-301-0/+18
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-175-174/+363
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-17/+5
| | | | | | | | | | | | | | | | | | | | This was necessary historically but hasn't been for many years. Can still get CreatorIdAsUuid, which is really just a UUID cached version of the string CreatorId
| * | | refactor: Move stat classes out of StatManager and into their own files for ↵Justin Clark-Casey (justincc)2012-11-163-260/+326
| | | | | | | | | | | | | | | | clarity.
| * | | Add a first draft mechanism for the IncomingPacketsProcessedStat to show the ↵Justin Clark-Casey (justincc)2012-11-162-4/+139
| | | | | | | | | | | | | | | | | | | | | | | | delta over time. The chief motivation for this is to be able to tell whether there's any impact on incoming packet processing from enabling extra packet pooling.
* | | | Merge branch 'master' into careminsterMelanie2012-11-151-4/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | | Make PacketPool class stats pull stats instead of push stats so they can be ↵Justin Clark-Casey (justincc)2012-11-151-4/+10
| | | | | | | | | | | | | | | | lifted up into LLUDPServer and be distiguished by scene name
* | | | Merge branch 'master' into careminsterMelanie2012-11-1512-7/+304
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-1411-4/+301
| | |
| * | Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't ↵Diva Canto2012-11-133-3/+3
| | | | | | | | | | | | have an AssemblyInfo file.
* | | Merge branch 'master' into careminsterMelanie2012-10-312-12/+11
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-312-12/+11
| | | | | | | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
* | | Merge branch 'master' into careminsterMelanie2012-10-311-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add AnimState to CADUMelanie2012-10-301-0/+36
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-302-1/+12
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | fixing poorly-formatted xml doc string for Util.IsInsideBoxSignpostMarv2012-10-291-1/+1
| | |
| * | Add "force gc" region console command which manually invokes garbage collection.Justin Clark-Casey (justincc)2012-10-291-0/+11
| | | | | | | | | | | | For debugging purposes.
* | | Merge branch 'master' into careminsterMelanie2012-10-264-71/+201
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-252-5/+18
| | | | | | | | | | | | | | | | | | | | | Viewer 3 will discard such a message if the chat message owner does not match the avatar. We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages. This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages. This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
| * | Add TestOsNpcLoadAppearance()Justin Clark-Casey (justincc)2012-10-251-0/+3
| | |
| * | Allow "show object", "show part", "dump object" and "delete object" to ↵Justin Clark-Casey (justincc)2012-10-241-2/+56
| | | | | | | | | | | | | | | | | | accept a local ID as well as a UUID. This means that the sub-commands are now id rather than uuid, e.g. show object id
| * | Get "save oar" and "save iar" to tell you in a more friendly manner if the ↵Justin Clark-Casey (justincc)2012-10-241-0/+19
| | | | | | | | | | | | | | | | | | filename to save already exists, rather than exception throwing. Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
| * | Add "dump object uuid" console command. This allows any object in the scene ↵Justin Clark-Casey (justincc)2012-10-241-91/+115
| | | | | | | | | | | | to be serialized and dumped to XML for debug purposes.
| * | minor: Move co-ordinate related help to object commands to common ↵Justin Clark-Casey (justincc)2012-10-241-0/+17
| | | | | | | | | | | | ConsoleUtil.CoordHelp
* | | Merge branch 'master' into careminsterMelanie2012-10-233-27/+87
|\ \ \ | |/ /
| * | Make it possible to turn the base UDP object packet pools on and off whilst ↵Justin Clark-Casey (justincc)2012-10-231-13/+1
| | | | | | | | | | | | | | | | | | running via the "debug lludp pool <on|off>" console command. For debug purposes. This does not currently apply to the higher LLUDP packetpool.
| * | Add object count stats for new IncomingPacket and UDPPacketBuffer pools if ↵Justin Clark-Casey (justincc)2012-10-232-6/+84
| | | | | | | | | | | | | | | | | | | | | | | | they are enabled. Add count stats for existing LLUDP pool. This introduces a pull stat type in addition to the push stat type. A pull stat takes a method on construction which knows how to update the stat on request. In this way, special interfaces for pull stat collection are not necessary.
| * | minor: Get content type handler logger to log "unset" for the content type ↵Justin Clark-Casey (justincc)2012-10-231-1/+1
| | | | | | | | | | | | instead of blank if no content type was set.
| * | minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data ↵Justin Clark-Casey (justincc)2012-10-231-8/+2
| | | | | | | | | | | | | | | | | | where this wasn't already used. This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
* | | Merge branch 'master' into careminsterMelanie2012-10-231-125/+260
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/LandData.cs
| * | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value ↵PixelTomsen2012-10-201-125/+260
| | | | | | | | | | | | | | | | | | (implementation of dwell-value in LandData + eventhandler, return always 0); source-formatting of LandData Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | If we're avoiding printing a long request warning for a GetTexture CAP call, ↵Justin Clark-Casey (justincc)2012-10-181-1/+1
| | | | | | | | | | | | | | | | | | check we received a request handler first since this is not guaranteed. Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
* | | Merge branch 'avination' into careminsterMelanie2012-10-181-8/+20
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | make sure a buffer is closed, and changed a misleading log msgUbitUmarov2012-10-051-8/+20
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-181-0/+15
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into ↵Justin Clark-Casey (justincc)2012-10-181-0/+15
| | | | | | | | | | | | IClientAPI from LLClientView
* | | Merge branch 'master' into careminsterMelanie2012-10-172-10/+23
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs
| * | Add LastMemoryChurn stat using existing data so we can more quickly tell how ↵Justin Clark-Casey (justincc)2012-10-162-2/+14
| | | | | | | | | | | | memory churn changes rather than waiting for the average to move.
* | | Merge branch 'master' into careminsterMelanie2012-10-171-0/+76
|\ \ \ | |/ / | | | | | | | | | 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-161-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.1 at 2024-12-20 08:51:05 +0000