Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-04 | 1 | -1/+12 | |
| | |\ \ \ | ||||||
| | * | | | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 5 | -23/+615 | |
| | | | | | | ||||||
| | * | | | | missing changed file | UbitUmarov | 2012-10-03 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled | UbitUmarov | 2012-10-03 | 2 | -4/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | for all physics engines) | |||||
| | * | | | | making meshworker have more work.. | UbitUmarov | 2012-10-03 | 2 | -4/+23 | |
| | | | | | | ||||||
| | * | | | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 7 | -163/+262 | |
| | | | | | | ||||||
| * | | | | | Allow the console to be used by gods as well as region owners. | Melanie | 2012-10-17 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | 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 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Fix perms when linking an object. Set root part perms to the perms | Melanie | 2012-10-14 | 5 | -15/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the link set to make the build floater behave consistently. Fixes permissions exploit introduced on 23 August. | |||||
| * | | | | | Allow bypassing perms dialog (console only) | Melanie | 2012-10-14 | 1 | -0/+4 | |
| | | | | | | ||||||
| * | | | | | Make texture sedning use only two threads to make things less harsh on bandwidth | Melanie | 2012-10-14 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Remove spammy debug for IM | Melanie | 2012-10-11 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Change permissions on child prim inventory items when god mode "force | Melanie | 2012-10-08 | 2 | -2/+10 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | permissive" is used. | |||||
* | | | | | 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 | 3 | -30/+131 | |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | 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 | 3 | -24/+125 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 42 | -633/+1218 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | ||||||
| * | | | | Add AgentUpdate to PacketPool. This is the most common inbound packet from ↵ | Justin Clark-Casey (justincc) | 2012-10-12 | 3 | -5/+28 | |
| | | | | | | | | | | | | | | | | | | | | viewers. |