| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Revert "fix CopyTo call that was breaking under mono 2.10" | Melanie | 2011-11-03 | 1 | -1/+1 |
| | | | | | | | | | This reverts commit d30971fdc243886b8fc614c7f869530db87e10f2. | ||||
| * | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-11-02 | 16 | -114/+121 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-11-02 | 4 | -23/+37 |
| | | |\ | |||||
| | | * | | fix CopyTo call that was breaking under mono 2.10 | Mic Bowman | 2011-11-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 15 | -113/+120 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-11-02 | 15 | -107/+117 |
| | | |\ \ | | | |/ | |||||
| | | | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-11-02 | 6 | -330/+402 |
| | | | |\ | |||||
| | | | | * | Get some hopefully more useful exception information when ↵ | Justin Clark-Casey (justincc) | 2011-11-02 | 2 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules | ||||
| | | | | * | Fix race condition that would sometimes send or save appearance for the ↵ | Justin Clark-Casey (justincc) | 2011-11-02 | 2 | -9/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong avatar. In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread. If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched. This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent. This change loads the fields into local references so that this doesn't happen. | ||||
| | | | | * | Catch any exceptions exiting the top of the robust console, as we already do ↵ | Justin Clark-Casey (justincc) | 2011-11-02 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the main simulator. This prevents issues such as transient mono console problems from crashing the server. | ||||
| | | | * | | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. | Dan Lake | 2011-11-02 | 11 | -92/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs. | ||||
| | * | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 0 | -0/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Port the Avination offline messaging system to Core | Melanie | 2011-11-02 | 4 | -23/+37 |
| | | | |/ | | |/| | |||||
| * | | | | Fix link order when linking sets to sets | Melanie | 2011-11-02 | 2 | -40/+18 |
| |/ / / | |||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-02 | 1 | -322/+350 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Restore the recursive calling of PRIM_LINK_TARGET because the version I made | Melanie | 2011-11-02 | 1 | -327/+334 |
| | | | | | | | | | | | | | breaks LINK_SET et al. | ||||
| | * | | Some positioning fixes from AVN trunk | Melanie | 2011-11-02 | 1 | -1/+42 |
| | | | | |||||
| * | | | 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 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |