Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | avoid crashing so debug is seen | UbitUmarov | 2012-10-09 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | another debug msg | UbitUmarov | 2012-10-09 | 1 | -0/+22 | |
| | | | | ||||||
| | * | | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 9 | -12/+45 | |
| | | | | ||||||
| | * | | temporary debug code | UbitUmarov | 2012-10-09 | 1 | -0/+19 | |
| | | | | ||||||
| | * | | fire a extra terseupdate when stopping (like in loosing physics). In some | UbitUmarov | 2012-10-09 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | cases things seem not to stop | |||||
| | * | | Change ray to land colision range limitation so it has no impact on other | UbitUmarov | 2012-10-09 | 1 | -6/+8 | |
| | | | | | | | | | | | | | | | | geom types | |||||
| | * | | move terrain geom to own ode space. Limit range on raycast if includes | UbitUmarov | 2012-10-09 | 4 | -83/+229 | |
| | | | | | | | | | | | | | | | | | | | | | | | | terrain until ode doesn't eat all stack. Add a pre-simulation method to do pending actors changes (except mesh assets still not ready to use), to be optionaly called before firing heartbeat. [UNTESTED] | |||||
| | * | | a few changes/fix (?) | UbitUmarov | 2012-10-07 | 4 | -117/+112 | |
| | | | | ||||||
| | * | | bug fix + make costs visible for testing | UbitUmarov | 2012-10-07 | 4 | -41/+85 | |
| | | | | ||||||
| | * | | refix so we can compile it, loosing alpha scultps fix on core meshmerizer | UbitUmarov | 2012-10-07 | 1 | -0/+11 | |
| | | | | ||||||
| | * | | fix wrong file commited | UbitUmarov | 2012-10-07 | 1 | -10/+0 | |
| | | | | ||||||
| | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-07 | 1 | -24/+7 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||||
| | | * | | comment out a spam coment on core Meshmerizer | UbitUmarov | 2012-10-07 | 1 | -26/+4 | |
| | | | | | ||||||
| | * | | | i update core ode plugin and make it load is meshs (i hope) | UbitUmarov | 2012-10-07 | 3 | -24/+118 | |
| | | | | | ||||||
| | * | | | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts | UbitUmarov | 2012-10-07 | 7 | -1052/+632 | |
| | | | | | | | | | | | | | | | | | | | | now | |||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-05 | 3 | -32/+50 | |
| | |\ \ \ | | | |/ / | ||||||
| | * | | | make sure a buffer is closed, and changed a misleading log msg | UbitUmarov | 2012-10-05 | 1 | -8/+20 | |
| | | | | | ||||||
| | * | | | more changes and more non active code | UbitUmarov | 2012-10-04 | 4 | -29/+144 | |
| | | | | | ||||||
| | * | | | apply cmic fix to multi layer wearables | UbitUmarov | 2012-10-04 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | 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 | 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 | |
| | | | | |