Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | minor: Increase attachment name field from 36 to 50 chars in "attachments ↵ | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show" report | |||||
| | * | | | | | | Fix a few minor issues in ArchiveReadRequest logging. | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-19 | 2 | -21/+103 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | altering documentation for llGetLinkName, as the current documentation is ↵ | SignpostMarv | 2012-10-19 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather lengthy for a "summary". | |||||
| | * | | | | | | | since llGetLinkName has a "simplest case", it should be the first check made. | SignpostMarv | 2012-10-19 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| | * | | | | | | | the simplest case for llGetLinkName also applies to the LINK_THIS constant | SignpostMarv | 2012-10-19 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | ensuring that operand order in llGetLinkName is internally consistent | SignpostMarv | 2012-10-19 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | minor: comment out currently unused logger in DynamicTextureModule | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | normalize quaternion.Slerp outputs | UbitUmarov | 2012-10-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 1 | -6/+11 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | [UNTESTED] core Ode: let broken mesh physical prims collide with land as | UbitUmarov | 2012-10-19 | 1 | -6/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the defaul basic box so they don't go off world. | |||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 2 | -41/+190 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-10-19 | 1 | -20/+93 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | Make "show part" console commands print out information about each item the ↵ | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -20/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part contains | |||||
| | * | | | | | | | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken | UbitUmarov | 2012-10-19 | 1 | -21/+97 | |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | assets behave like phantom by Nebadon request | |||||
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 3 | -37/+102 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | minor: Convert ad-hoc list building in ObjectCommandsModule to use ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -21/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConsoleDisplayList | |||||
| | * | | | | | | Add local and UUID to information output of "show object" and "show part" ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region console commands | |||||
| | * | | | | | | Add --full option to "show object name/uuid/pos" to show info on all parts ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -20/+60 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of an object, not just whole object summary information. | |||||
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-18 | 5 | -40/+70 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Add number of inventory items to information displayed via "show part" ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 3 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console command | |||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | Remove extraneous calls to the now commented CheckSculptAndLoad | Melanie | 2012-10-18 | 1 | -24/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | extend coment to include all unused SOG CheckSculptAndLoad() | UbitUmarov | 2012-10-18 | 1 | -3/+4 | |
| | | | | | | | | | ||||||
| | * | | | | | | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-18 | 2 | -14/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | | | | | | missing changed file | UbitUmarov | 2012-10-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | | | | | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-18 | 2 | -2/+51 | |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 23 | -1206/+2339 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 1 | -15/+0 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||||
| | * | | | | | | | If we're avoiding printing a long request warning for a GetTexture CAP call, ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -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. | |||||
| | * | | | | | | | minor: Remove event method doc from LLClientView that I forgot in the last ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit (1de80c) | |||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 2 | -41/+83 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||||
| | * | | | | | | | minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into ↵ | Justin Clark-Casey (justincc) | 2012-10-18 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IClientAPI from LLClientView | |||||
| | * | | | | | | | Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of ↵ | Justin Clark-Casey (justincc) | 2012-10-17 | 1 | -41/+68 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which there are 10 a second) rather than constructing a new one every time. We can do this because AgentUpdate packets are handled synchronously. | |||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-10-17 | 4 | -14/+62 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||||
| | * | | | | | | | Explicitly return only the incoming AgentUpdate packet as this is the only ↵ | Justin Clark-Casey (justincc) | 2012-10-17 | 3 | -8/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one we pool atm, rather than attempting to return all incoming packets. | |||||
| | * | | | | | | | If RecycleBaseUDPPackets = true, also pool IncomingPackets to reduce memory ↵ | Justin Clark-Casey (justincc) | 2012-10-17 | 2 | -2/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | churn | |||||
| * | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-17 | 7 | -18/+45 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | 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 | |
| | | | | | | | | | |