Melanie
413f0c6848
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-11 23:53:52 +01:00
Melanie
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
Justin Clark-Casey (justincc)
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
Justin Clark-Casey (justincc)
754c244f46
In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row 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
2011-02-11 23:06:14 +00:00
Justin Clark-Casey (justincc)
98af0db8c0
minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting
2011-02-11 22:16:53 +00:00
Justin Clark-Casey (justincc)
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
Diva Canto
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
Diva Canto
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
.
2011-02-10 06:09:04 -08:00
Diva Canto
21715396fa
Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues.
2011-02-09 17:45:19 -08:00
Diva Canto
f33e51e2ff
Comment instrumentation out. Not needed anymore. Left in comments, in case it is needed again. Mantis #5365
2011-02-09 09:50:26 -08:00
Diva Canto
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
Diva Canto
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
.
2011-02-09 08:35:36 -08:00
Diva Canto
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
.
2011-02-09 08:35:21 -08:00
Diva Canto
477a869fb2
More detection of negatives.
2011-02-09 08:08:57 -08:00
Diva Canto
473fac4dc7
Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles.
2011-02-09 08:06:20 -08:00
Diva Canto
ba202ea9b0
Don't build strings unless we're in emergency debugging.
2011-02-08 21:09:10 -08:00
Diva Canto
585473aade
Brute-force debug -- mantis #5365
2011-02-08 20:12:33 -08:00
Diva Canto
117462cba1
Avoid potential race conditions on UseCircuitCode. I artificially made the race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back.
2011-02-08 17:53:01 -08:00
Diva Canto
f431bd20ec
Minor addition to the previous commit
2011-02-08 14:49:50 -08:00
Diva Canto
82846afe4b
Minor improvement to previous commit.
2011-02-08 12:37:37 -08:00
Melanie
f62cb1fcbe
Temp fix (or is it a fox?) for map weirdness
2011-02-08 21:13:31 +01:00
Diva Canto
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
Diva Canto
34bd41d186
Comment previous debug
2011-02-08 11:16:38 -08:00
Diva Canto
305c755cfb
XFF header again -- debug.
2011-02-08 07:50:01 -08:00
Diva Canto
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
Diva Canto
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
Melanie
8c20f94939
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-07 22:26:09 +01:00
Melanie
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
Melanie
6becaf65e1
Fix merge issues
2011-02-07 22:28:59 +00:00
Melanie
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
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
2011-02-07 22:08:53 +00:00
Melanie
e8ba3d3a10
Prevent a nonexistent inventory item from throwing an exception
2011-02-07 22:25:43 +01:00
Diva Canto
ebeef02fef
Hunting down mantis #5365
...
Revert "refactor: remove redundant null checks"
This reverts commit 6e58996b4d
.
2011-02-07 07:45:03 -08:00
Diva Canto
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
Diva Canto
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
Diva Canto
3411d4867d
Honor check of m_Enabled in WorldViewModule.
2011-02-05 19:40:55 -08:00
Diva Canto
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
Diva Canto
30fa5ad1e2
One more diagnosis command:
...
show caps
2011-02-05 19:21:12 -08:00
Diva Canto
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
Diva Canto
3a2a48a8ca
Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future.
2011-02-05 08:20:13 -08:00
Diva Canto
67555994ad
Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.
2011-02-05 07:55:54 -08:00
Melanie
f78831ec98
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-02-05 04:25:14 +00:00
Melanie
4e0b0f0f4c
Fix a typo in the QUERYACCESS method name
2011-02-05 04:24:43 +00:00
Diva Canto
632babf8fb
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
2011-02-04 19:19:38 -08:00
Diva Canto
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that 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...
2011-02-04 17:05:45 -08:00
Justin Clark-Casey (justincc)
cdd64bb8f5
For now, reinstate the call to World.GridService.GetRegionsByName() 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()
2011-02-05 00:15:25 +00:00
Justin Clark-Casey (justincc)
1ffd70cef7
minor: remove some mono compiler warnings
2011-02-04 23:20:10 +00:00
Justin Clark-Casey (justincc)
5b7a5a5b8b
Add position to IM sent from llInstantMessage(), to better fulfill client expectations
2011-02-04 23:14:21 +00:00
Justin Clark-Casey (justincc)
a51005aacd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 23:08:27 +00:00
Justin Clark-Casey (justincc)
722f0ba18c
Put something in the ImprovedInstantMessage.BinaryBucket for 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
2011-02-04 23:07:47 +00:00
Mic Bowman
bb69a40fbb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 14:22:17 -08:00