aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Fix a merge issueMelanie2012-10-121-5/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-126-56/+273
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Get Watchdog to log thread removalJustin Clark-Casey (justincc)2012-10-121-1/+19
| | |
| * | Fix percentage stats to multiply by 100. Adjust container name for ↵Justin Clark-Casey (justincc)2012-10-121-2/+2
| | | | | | | | | | | | packetpool stats.
| * | Fix build break by moving OpenSim.Framework.Console back below HttpServer in ↵Justin Clark-Casey (justincc)2012-10-121-2/+1
| | | | | | | | | | | | | | | | | | 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-111-3/+13
| | | | | | | | | | | | | | | 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.
| * | Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-113-52/+189
| | | | | | | | | | | | | | | | | | 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.
| * | Add "delete object pos <start-coord> to <end-coord>" console command.Justin Clark-Casey (justincc)2012-10-101-2/+2
| | | | | | | | | | | | | | | This allows one to delete objects within a certain volume. See help on console for more details.
| * | minor: Add documentation to IGridService.GetRegionFlags()Justin Clark-Casey (justincc)2012-10-091-0/+1
| | |
| * | Once again, forgot to add a file.Justin Clark-Casey (justincc)2012-10-091-0/+52
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-074-251/+132
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| * | Add Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 ↵Justin Clark-Casey (justincc)2012-10-051-0/+3
| | | | | | | | | | | | but not mono 2.10.9
| * | Add missing ConsoleUtil from last commitJustin Clark-Casey (justincc)2012-10-051-0/+111
| | |
| * | Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-051-0/+13
| | | | | | | | | | | | | | | | | | This allows you to display details of all objects in a given bounding box. Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30. See "help show object pos" for more details.
| * | refactor: Move OpenSim.Framework.PacketPool to ↵Justin Clark-Casey (justincc)2012-10-051-247/+0
| | | | | | | | | | | | | | | | | | | | | OpenSim.Region.Clientstack.Linden.UDP This is to allow it to use OpenSim.Framework.Monitoring in the future. This is also a better location since the packet pool is linden udp specific
* | | Merge branch 'master' into careminsterMelanie2012-10-042-2/+156
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-041-2/+33
| | | | | | | | | | | | Not yet used.
| * | Add experimental "slow frames" stat, available in "show stats" and via the ↵Justin Clark-Casey (justincc)2012-10-042-2/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | monitoring module. This increments a SlowFrames counter if a frame takes over 120% of maximum time. This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic. This is more granualar than asking objects to create their own reports. At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
| * | Allow setting connection limits, part 2Melanie2012-09-301-1/+26
| | |
generated by cgit v1.1 at 2024-12-17 10:48:08 +0000