Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 13 | -405/+605 |
|\ | |||||
| * | refactor: split out estate management commands into separate class | Justin Clark-Casey (justincc) | 2011-02-11 | 2 | -340/+400 |
| | | |||||
| * | In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row ↵ | Justin Clark-Casey (justincc) | 2011-02-11 | 2 | -6/+0 |
| | | | | | | | | | | | | | | | | from the data adaptor's Rows list in addition to calling Delete. This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication). Probably a holdover from copying code from the older legacy adaptor. Resolves http://opensimulator.org/mantis/view.php?id=5361 | ||||
| * | minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -0/+3 |
| | | |||||
| * | add estate name to show regions console command | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -2/+3 |
| | | |||||
| * | Reinstated a couple of null checks related to the previous revert. | Diva Canto | 2011-02-10 | 1 | -11/+15 |
| | | |||||
| * | Revert "Hunting down mantis #5365" | Diva Canto | 2011-02-10 | 1 | -30/+15 |
| | | | | | | | | This reverts commit ebeef02fef1a04b5b4cfe13dad588bcce7f9ba21. | ||||
| * | Put the Ack of UseCircuitCode back to where it used to be. Some ppl are ↵ | Diva Canto | 2011-02-09 | 1 | -6/+5 |
| | | | | | | | | reporting login issues. | ||||
| * | Comment instrumentation out. Not needed anymore. Left in comments, in case ↵ | Diva Canto | 2011-02-09 | 1 | -4/+7 |
| | | | | | | | | it is needed again. Mantis #5365 | ||||
| * | Fix the negative number problem in TokenBucket. mantis #5365 | Diva Canto | 2011-02-09 | 1 | -5/+4 |
| | | |||||
| * | Revert "Brute-force debug -- mantis #5365" | Diva Canto | 2011-02-09 | 2 | -20/+3 |
| | | | | | | | | This reverts commit 585473aade100c3ffeef27e0c8e6b6c8c09d0109. | ||||
| * | Revert "Don't build strings unless we're in emergency debugging." | Diva Canto | 2011-02-09 | 1 | -8/+8 |
| | | | | | | | | This reverts commit ba202ea9b08b1205de343c65fd209b6cca4cb6bc. | ||||
| * | More detection of negatives. | Diva Canto | 2011-02-09 | 1 | -0/+3 |
| | | |||||
| * | Detect negative dripAmounts in TokenBuckets. These negatives result from ↵ | Diva Canto | 2011-02-09 | 2 | -1/+4 |
| | | | | | | | | overflown integer operations. Also added Total to the scene throttles in show throttles. | ||||
| * | Don't build strings unless we're in emergency debugging. | Diva Canto | 2011-02-08 | 1 | -8/+8 |
| | | |||||
| * | Brute-force debug -- mantis #5365 | Diva Canto | 2011-02-08 | 2 | -3/+20 |
| | | |||||
| * | Avoid potential race conditions on UseCircuitCode. I artificially made the ↵ | Diva Canto | 2011-02-08 | 1 | -23/+28 |
| | | | | | | | | race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back. | ||||
| * | Minor addition to the previous commit | Diva Canto | 2011-02-08 | 1 | -3/+12 |
| | | |||||
| * | Minor improvement to previous commit. | Diva Canto | 2011-02-08 | 1 | -2/+4 |
| | | |||||
| * | Added emergency monitoring of UDP Outgoing packets thread. Just type ↵ | Diva Canto | 2011-02-08 | 3 | -2/+130 |
| | | | | | | | | "emergency-monitoring on/off" | ||||
| * | Comment previous debug | Diva Canto | 2011-02-08 | 1 | -3/+3 |
| | | |||||
| * | XFF header again -- debug. | Diva Canto | 2011-02-08 | 1 | -0/+5 |
| | | |||||
| * | Mantis #5368 -- exception on WorldMap | Diva Canto | 2011-02-07 | 1 | -3/+4 |
| | | |||||
| * | Thanks Tokeiito for noticing this bug. mantis #5366 | Diva Canto | 2011-02-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-02-07 | 45 | -1790/+737 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 11 | -21/+208 |
| |\ \ | | |/ | |||||
| | * | Hunting down mantis #5365 | Diva Canto | 2011-02-07 | 1 | -15/+30 |
| | | | | | | | | | | | | | | | | | | Revert "refactor: remove redundant null checks" This reverts commit 6e58996b4d9db202cd7795a37bd687362effef48. | ||||
| | * | New command: show pending-objects | Diva Canto | 2011-02-06 | 3 | -0/+31 |
| | | | |||||
| | * | Better output for show neighbours | Diva Canto | 2011-02-06 | 1 | -2/+6 |
| | | | |||||
| | * | Honor check of m_Enabled in WorldViewModule. | Diva Canto | 2011-02-05 | 1 | -0/+3 |
| | | | |||||
| | * | Fixed Caps handlers leak | Diva Canto | 2011-02-05 | 2 | -2/+1 |
| | | | |||||
| | * | One more diagnosis command: | Diva Canto | 2011-02-05 | 1 | -1/+27 |
| | | | | | | | | | | | | show caps | ||||
| | * | Added a couple of console commands to help diagnose issues: | Diva Canto | 2011-02-05 | 2 | -0/+82 |
| | | | | | | | | | | | | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers | ||||
| | * | Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still ↵ | Diva Canto | 2011-02-05 | 1 | -1/+29 |
| | | | | | | | | | | | | supported for backwards compatibility, but will be removed in the future. | ||||
| | * | Amend to yesterday's deletions: forgot to delete the RemoteInventory module ↵ | Diva Canto | 2011-02-05 | 1 | -1/+0 |
| | | | | | | | | | | | | in th addin.xml file. | ||||
| * | | Fix merge issues | Melanie | 2011-02-07 | 4 | -68/+7 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 34 | -1733/+554 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-02-05 | 27 | -1694/+197 |
| | |\ | |||||
| | | * | Added an additional debug message, and removed a bunch of files that weren't ↵ | Diva Canto | 2011-02-04 | 6 | -1615/+5 |
| | | | | | | | | | | | | | | | | being used anymore -- the old RemotsInventory connectors stuff. | ||||
| | | * | Added a config var to HGInventoryAccessModule called OutboundPermission that ↵ | Diva Canto | 2011-02-04 | 4 | -2/+25 |
| | | | | | | | | | | | | | | | | controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things... | ||||
| | | * | For now, reinstate the call to World.GridService.GetRegionsByName() ↵ | Justin Clark-Casey (justincc) | 2011-02-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | commented out in 933f47e Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation() | ||||
| | | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-02-04 | 2 | -5/+5 |
| | | | | |||||
| | | * | Add position to IM sent from llInstantMessage(), to better fulfill client ↵ | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | expectations | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -11/+12 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-02-04 | 7 | -27/+45 |
| | | | |\ | |||||
| | | | * | | Convert SimianMaptile refresh time from ms to seconds. Too many 0's | Mic Bowman | 2011-02-04 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | in the config file. | ||||
| | | * | | | Put something in the ImprovedInstantMessage.BinaryBucket for ↵ | Justin Clark-Casey (justincc) | 2011-02-04 | 2 | -1/+18 |
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this). We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value. This resolves http://opensimulator.org/mantis/view.php?id=5356 | ||||
| | | * | | minor: fix indentation, spacing on commit 3585130 | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | this previous commit tries to look up the texture by name first before just using the uuid. this allows correct resolution of inventory textures which have uuids as names. | ||||
| | | * | | SetTexture_fix | unknown | 2011-02-04 | 1 | -7/+6 |
| | | | | | |||||
| | | * | | minor: correct a log spelling mistake that was pointed out to me | Justin Clark-Casey (justincc) | 2011-02-04 | 1 | -1/+1 |
| | | | | |