Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 2 | -6/+1 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario | Melanie | 2011-11-02 | 1 | -4/+3 | |
| |/ | ||||||
| * | Removed redundant SceneContents property from Scene. It's the same as ↵ | Dan Lake | 2011-11-01 | 2 | -6/+1 | |
| | | | | | | | | 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 | 19 | -817/+255 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||||
| * | Removed see_into_this_sim_from_neighbor configuration option. | Dan Lake | 2011-11-01 | 3 | -14/+1 | |
| | | ||||||
| * | Add "appearance send" command to allow manual sending of appearance. | Justin Clark-Casey (justincc) | 2011-11-01 | 3 | -6/+23 | |
| | | ||||||
| * | Add "show status" command to pCambot | Justin Clark-Casey (justincc) | 2011-11-01 | 2 | -22/+45 | |
| | | ||||||
| * | Listen only for non SimShutdown Network.Disconnect firing so that we don't ↵ | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -1/+7 | |
| | | | | | | | | quite the program before all bots have actually logged off. | |||||
| * | get rid of unused m_verbose field | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -1/+0 | |
| | | ||||||
| * | stop recording the threads on which we happen to start bots. These are ↵ | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -7/+5 | |
| | | | | | | | | pointless since they terminate quickly | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-11-01 | 3 | -48/+13 | |
| |\ | ||||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-31 | 8 | -623/+58 | |
| | |\ | ||||||
| | * | | Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵ | Dan Lake | 2011-10-31 | 3 | -48/+13 | |
| | | | | | | | | | | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules. | |||||
| * | | | Retain a reference to an action thread rather than starting an infinite loop ↵ | Justin Clark-Casey (justincc) | 2011-11-01 | 1 | -8/+20 | |
| | |/ | |/| | | | | | | | via a timer, so that we can actually abort the action thread on shutdown | |||||
| * | | Make bots share a cache so that asset downloads attempts are only made once ↵ | Justin Clark-Casey (justincc) | 2011-10-31 | 2 | -20/+24 | |
| | | | | | | | | | | | | instead of once for each bot | |||||
| * | | Remove OpenSim.TestSuite | Justin Clark-Casey (justincc) | 2011-10-31 | 8 | -600/+9 | |
| | | | | | | | | | | | | Hasn't been touched since 2009 and wasn't more than another copy of pCampBot | |||||
| * | | Stop individual bots attempting to download the same asset more than once | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -14/+36 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -1/+1 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-31 | 5 | -102/+98 | |
| | |\ | ||||||
| | * | | Adding green dots to map response should be for root agents only | Dan Lake | 2011-10-31 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix bot disconnection | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
| * | | adjust pCampbot so it starts up bots with the name format "<firstname> ↵ | Justin Clark-Casey (justincc) | 2011-10-31 | 4 | -94/+89 | |
| | | | | | | | | | | | | | | | | | | | | | <lastname>_<bot-number>" e.g. starting up two bots called "Ima Bot" will give them the names "Ima Bot_0" and "Ima Bot_1" This is necessary since bots with random names can no longer be created, as there's no easy way to turn off account authentication | |||||
| * | | Remove unused PumaCode.SvnDotNet library | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -0/+0 | |
| | | | ||||||
| * | | Stop pCampbot from firing connected event twice, which results in double ↵ | Justin Clark-Casey (justincc) | 2011-10-31 | 2 | -10/+11 | |
| |/ | | | | | | | counting. | |||||
| * | Plug a security hole in the inventory service | Melanie | 2011-10-31 | 1 | -1/+2 | |
| | | ||||||
* | | 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. | |||||
* | | Plug a security hole in the inventory service | Melanie | 2011-10-31 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 11 | -139/+129 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| * | Add missing max_listens_per_region to [LL_Functions] config section in ↵ | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -0/+4 | |
| | | | | | | | | | | | | OpenSimDefaults.ini + explanation. This setting controls the maximum number of listeners in a region | |||||
| * | 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. | |||||
| * | Add taint target velocity for ODECharacters as is already done for ↵ | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -7/+12 | |
| | | | | | | | | | | | | | | ODECharacter position and position and velocity for ODEPrims. This is to help stop surprises if the velocity is set in the middle of physics calculations, though this probably isn't a huge problem. It's more for consistency and for the next step of removing some scene locks | |||||
| * | tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment ↵ | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -51/+39 | |
| | | | | | | | | | | | | directly where possible, instead of transferring X, Y and Z components separately some of this is probably a hold over from using ODE.Vector3, which is still necessary in some places. | |||||
| * | Move position set from taint to logically better position at top of ↵ | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -12/+12 | |
| | | | | | | | | ODECharacter.ProcessTaints() though this makes no practical difference | |||||
| * | Stop setting _position as well as m_taint_position in ODECharacter.Position | Justin Clark-Casey (justincc) | 2011-10-29 | 2 | -6/+3 | |
| | | | | | | | | | | setting position at the same time as taint appears to undermine the whole purpose of taint testing doesn't reveal any obvious regressions in doing this | |||||
| * | Remove completely unused SOG.Rotation parameter | Justin Clark-Casey (justincc) | 2011-10-29 | 3 | -18/+10 | |
| | | | | | | | | We always use SOP.Rotation instead | |||||
| * | set grp.RootPart.GroupPosition for code consistency (and readability) rather ↵ | Justin Clark-Casey (justincc) | 2011-10-28 | 2 | -7/+2 | |
| | | | | | | | | 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 | 22 | -227/+171 | |
| |\ | ||||||
| * | | 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. | |||||
* | | | Fix the offline message module to revert core changes and restore avn | Melanie | 2011-10-28 | 1 | -18/+28 | |
| | | | | | | | | | | | | specific behavior | |||||
* | | | Reduce severity and remove duplication if a common log message regarding | Melanie | 2011-10-28 | 1 | -3/+1 | |
| | | | | | | | | | | | | baked textures | |||||
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-27 | 27 | -218/+209 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 27 | -218/+209 | |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | Removed use of 'is' operator and casting to find the root ScenePresence in ↵ | Dan Lake | 2011-10-27 | 4 | -82/+53 | |
| | | | | | | | | | | | | | | | | MessageTransfer modules and Groups module. | |||||
| | * | | Continuation of previous checkin. Found more places where ↵ | Dan Lake | 2011-10-27 | 4 | -57/+39 | |
| | | | | | | | | | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence. | |||||
| | * | | Added new ForEachRootScenePresence to Scene since almost every delegate ↵ | Dan Lake | 2011-10-27 | 14 | -88/+79 | |
| | |/ | | | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors. |