aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-181-15/+0
|\ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
| * minor: Remove event method doc from LLClientView that I forgot in the last ↵Justin Clark-Casey (justincc)2012-10-181-15/+0
| | | | | | | | commit (1de80c)
* | Merge branch 'master' into careminsterMelanie2012-10-181-41/+68
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of ↵Justin Clark-Casey (justincc)2012-10-171-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 careminsterMelanie2012-10-174-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-173-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-172-2/+30
| | | | | | | | churn
* | Merge branch 'avination' into careminsterMelanie2012-10-177-18/+45
|\ \
| * | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-145-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)Melanie2012-10-141-0/+4
| | |
| * | Make texture sedning use only two threads to make things less harsh on bandwidthMelanie2012-10-141-2/+2
| | |
| * | Remove spammy debug for IMMelanie2012-10-111-3/+3
| | |
| * | Change permissions on child prim inventory items when god mode "forceMelanie2012-10-082-2/+10
| | | | | | | | | | | | permissive" is used.
| * | Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| | | | | | | | | | | | Fixes Mantis #6327
* | | Merge branch 'master' into careminsterMelanie2012-10-171-1/+2
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs
| * | minor: Make BasicCircuitTests.SetUp() call overriden base method instead of ↵Justin Clark-Casey (justincc)2012-10-161-1/+2
| | | | | | | | | | | | ignoring it.
* | | Merge branch 'master' into careminsterMelanie2012-10-172-30/+55
|\ \ \ | |/ / | | | | | | | | | 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-162-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | 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 careminsterMelanie2012-10-162-31/+129
|\ \ \ | |/ /
| * | Make it possible to separate start and stop lludp packet processing from the ↵Justin Clark-Casey (justincc)2012-10-162-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 careminsterMelanie2012-10-167-23/+56
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
| * | Add missing category paremeter to llGiveInventoryList grid IM construction.Justin Clark-Casey (justincc)2012-10-161-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 commandJustin Clark-Casey (justincc)2012-10-161-4/+4
| | |
| * | minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-162-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-161-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-161-1/+1
| | |
| * | minor: Fix and elaborate on log information printed when an unrecognized ↵Justin Clark-Casey (justincc)2012-10-131-2/+14
| | | | | | | | | | | | estate method is received from the client.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-131-1/+2
| |\ \
| * | | Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only ↵Justin Clark-Casey (justincc)2012-10-131-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 Renfold2012-10-131-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.
* | | | Merge branch 'master' into careminsterMelanie2012-10-1227-529/+879
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 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 Adams2012-10-121-1/+2
| |/ /
| * | Get rid of accidental scene start left in ScenePresenceAutopilotTestsJustin Clark-Casey (justincc)2012-10-121-1/+0
| | |
| * | Fix problems with regression tests by allowing invoke of Update() with a ↵Justin Clark-Casey (justincc)2012-10-122-3/+5
| | | | | | | | | | | | finite number of frames even if the scene isn't active.
| * | Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-122-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-121-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 packetpoolJustin Clark-Casey (justincc)2012-10-121-1/+1
| | |
| * | Add AgentUpdate to PacketPool. This is the most common inbound packet from ↵Justin Clark-Casey (justincc)2012-10-123-5/+28
| | | | | | | | | | | | viewers.
| * | BulletSim: fix problem with some shapes (like cylinders) being implemented ↵Robert Adams2012-10-111-1/+1
| | | | | | | | | | | | as cubes.
| * | Fix percentage stats to multiply by 100. Adjust container name for ↵Justin Clark-Casey (justincc)2012-10-121-2/+2
| | | | | | | | | | | | packetpool stats.
| * | Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing ↵Justin Clark-Casey (justincc)2012-10-121-1/+3
| | | | | | | | | | | | Packetpool code.
| * | Fix packetpool for ImprovedTerseObjectUpdate packets.Justin Clark-Casey (justincc)2012-10-113-5/+15
| | | | | | | | | | | | | | | 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.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-1110-202/+316
| |\ \
| | * | BulletSim: remove some unused API2 calls because they were removed from ↵Robert Adams2012-10-112-14/+2
| | | | | | | | | | | | | | | | Bullet 2.81
| | * | BulletSim: normalize physics FPS to 45 (for real this time).Robert Adams2012-10-111-2/+2
| | | |
| | * | BulletSim: normalize physics FPS to 45.Robert Adams2012-10-111-3/+4
| | | |
| | * | BulletSim: Use full linkset mass when computing vehicle gravity force. Add ↵Robert Adams2012-10-113-11/+16
| | | | | | | | | | | | | | | | taint-time specification to new AddForce().
| | * | BulletSim: Change defaults for constraint CFM and ERP to make large linksets ↵Robert Adams2012-10-112-11/+8
| | | | | | | | | | | | | | | | more rigid. Remove mass calculation for terrain (it should stay a static object).
| | * | BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to ↵Robert Adams2012-10-117-52/+74
| | | | | | | | | | | | | | | | improve interactions.
| | * | BulletSim: Add Force* operations to objects to allow direct push to engine.Robert Adams2012-10-117-29/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update BSDynamics to use same (don't want to delay updates til next taint-time. Suppress queuing a taint update for position and orientation calls if value does not change. Move Bullet timing statistics call from C# back to C++ code. Throttle taints per simulation step and add parameter to set. By default, don't create hulls for physical objects. Add a parameter to turn on and off.