| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 1 | -5/+0 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Removed redundant SceneContents property from Scene. It's the same as ↵ | Dan Lake | 2011-11-01 | 1 | -5/+0 |
| | | | | | | | | | SceneGraph property. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 1 | -10/+7 |
| |\ \ | |/ | |||||
| | * | Part 2 of see_into_this_sim_from_neighbor configuration option removal | Dan Lake | 2011-11-01 | 1 | -10/+7 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 4 | -62/+4 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | Removed see_into_this_sim_from_neighbor configuration option. | Dan Lake | 2011-11-01 | 2 | -11/+1 |
| | | | |||||
| | * | Add "appearance send" command to allow manual sending of appearance. | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -3/+3 |
| | | | |||||
| | * | Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵ | Dan Lake | 2011-10-31 | 2 | -48/+0 |
| | | | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-31 | 1 | -27/+25 |
| |\ \ | |/ | |||||
| | * | Fix line endings | Dan Lake | 2011-10-30 | 1 | -23/+23 |
| | | | |||||
| | * | Experimental reorder of Heartbeat loop now simulates physics and sends ↵ | Dan Lake | 2011-10-30 | 1 | -29/+27 |
| | | | | | | | | | updates to clients prior to sleep. Existing behavior was to sleep BEFORE sending updates. We found this patch reduced latency to clients by 1-2 heartbeat periods. | ||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 6 | -66/+62 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Remove the SyncRoot locking from Scene which was only being done around the ↵ | Justin Clark-Casey (justincc) | 2011-10-29 | 3 | -32/+18 |
| | | | | | | | | | | | | | main physics loop and ScenePresence position and velocity setting This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting. | ||||
| | * | Remove completely unused SOG.Rotation parameter | Justin Clark-Casey (justincc) | 2011-10-29 | 2 | -17/+9 |
| | | | | | | | | | We always use SOP.Rotation instead | ||||
| | * | set grp.RootPart.GroupPosition for code consistency (and readability) rather ↵ | Justin Clark-Casey (justincc) | 2011-10-28 | 1 | -5/+0 |
| | | | | | | | | | than calling SOP.OffsetForNewRegion | ||||
| | * | Add missing doc to rotation/position methods in SOG | Justin Clark-Casey (justincc) | 2011-10-28 | 1 | -5/+5 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-28 | 5 | -71/+76 |
| | |\ | |||||
| | * | | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than ↵ | Justin Clark-Casey (justincc) | 2011-10-28 | 2 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | fetch four separate times. No functional change. | ||||
| * | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-27 | 5 | -71/+78 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 5 | -71/+78 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | | Continuation of previous checkin. Found more places where ↵ | Dan Lake | 2011-10-27 | 2 | -36/+26 |
| | | | | | | | | | | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence. | ||||
| | | * | | Added new ForEachRootScenePresence to Scene since almost every delegate ↵ | Dan Lake | 2011-10-27 | 3 | -35/+50 |
| | | |/ | | | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors. | ||||
| | | * | Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵ | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | only receive the very first collision. | ||||
| * | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-26 | 4 | -12/+8 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -1/+1 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 3 | -11/+7 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | | * | Get rid of the pointless null checks on collision listeners. Add warning ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -7/+0 |
| | | | | | | | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc | ||||
| | | * | For ScenePresence collision events, instead of creating a new ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead. This assumes that the listener is using the data synchronously, which is currently the case. | ||||
| | | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
| * | | | Fix a missing locking call | Melanie | 2011-10-25 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+3 |
| |\ \ | |/ | |||||
| | * | Add new EventQueueTests with basic test to check that adding a client ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -1/+3 |
| | | | | | | | | | registers an http poll | ||||
| * | | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | Comment out the uuid gatherer lines that I accidentally left in. | Justin Clark-Casey (justincc) | 2011-10-23 | 1 | -4/+4 |
| | | | |||||
| * | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -16/+48 |
| |\ \ | |/ | |||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -16/+48 |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | ||||
| * | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+8 |
| |\ \ | |/ | |||||
| | * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -2/+8 |
| | | | | | | | | | However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference | ||||
| * | | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+4 |
| |\ \ | |/ | |||||
| | * | Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless ↵ | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -12/+4 |
| | | | | | | | | | | | | | | | | | | | Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime) SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame. This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog. This doesn't appear to play much practical role right now. ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value. | ||||
| * | | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 |
| |\ \ | |/ | |||||
| | * | Removed redundant NotInTransit function from ScenePresence. ↵ | Dan Lake | 2011-10-19 | 1 | -5/+0 |
| | | | | | | | | | IsInTransit=false does the same thing and NotInTransit was not used anywhere. | ||||
| * | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 3 | -50/+50 |
| |\ \ | |/ | |||||
| | * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵ | Dan Lake | 2011-10-19 | 3 | -50/+50 |
| | | | | | | | | | endings from previous commit. | ||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 1 | -5/+9 |
| | |\ | |||||
| * | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵ | Dan Lake | 2011-10-19 | 3 | -7/+10 |
| | | | | | | | | | | | | | scene presence by client ID. | ||||
| * | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+9 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Extend scripts stop/start/suspend/resume console commands to allow action on ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -5/+9 |
| | |/ | | | | | | | | | | | a single script by giving the script item id (which can be found via scripts show). Not an ideal way to do this on a region with many scripts. Needs refinement later. | ||||
| * | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+3 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |