5d6d0aa142
Catch HttpServer exception: mantis #5381
2011-02-15 08:38:37 -08:00
c9d2194ecb
Merge branch 'master' of /home/opensim/src/OpenSim/Core
2011-02-14 12:54:51 -05:00
c75e916ccf
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 07:42:53 -08:00
19d3792278
Fix and simplify QBasedComparer.
...
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
6601771f81
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 00:30:43 -05:00
0d495ced4c
Revert "Fix unsitting of avatar on linked sets"
...
This reverts commit b492f1ce99
2011-02-13 00:29:06 -05:00
c169a62f55
Typo
2011-02-12 18:05:25 -08:00
b492f1ce99
Fix unsitting of avatar on linked sets
2011-02-12 20:50:24 -05:00
c0e1742d47
Merge branch 'master' of /home/opensim/src/OpenSim/Core
2011-02-12 20:42:11 -05:00
059e9eaf98
Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis #5373 and #5384
2011-02-12 14:38:46 -08:00
ba03e2e262
Add the country functions in the careminster API
2011-02-12 20:59:09 +01:00
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
9801bf03f8
minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects.
2011-02-12 01:14:12 +00:00
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
7e21c1eadf
Hack in a crude temporary "estate show" command
...
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00:00
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
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
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
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
98af0db8c0
minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting
2011-02-11 22:16:53 +00:00
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
2011-02-10 06:09:04 -08:00
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
0f736e5601
Merge branch 'master' of /home/opensim/src/OpenSim/Core
2011-02-09 14:45:40 -05:00
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
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
2011-02-09 08:35:36 -08:00
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
2011-02-09 08:35:21 -08:00
477a869fb2
More detection of negatives.
2011-02-09 08:08:57 -08:00
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
ba202ea9b0
Don't build strings unless we're in emergency debugging.
2011-02-08 21:09:10 -08:00
585473aade
Brute-force debug -- mantis #5365
2011-02-08 20:12:33 -08:00
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
f431bd20ec
Minor addition to the previous commit
2011-02-08 14:49:50 -08:00
82846afe4b
Minor improvement to previous commit.
2011-02-08 12:37:37 -08:00
f62cb1fcbe
Temp fix (or is it a fox?) for map weirdness
2011-02-08 21:13:31 +01:00
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
34bd41d186
Comment previous debug
2011-02-08 11:16:38 -08:00
305c755cfb
XFF header again -- debug.
2011-02-08 07:50:01 -08:00
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
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
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
6becaf65e1
Fix merge issues
2011-02-07 22:28:59 +00:00
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
e8ba3d3a10
Prevent a nonexistent inventory item from throwing an exception
2011-02-07 22:25:43 +01:00
ebeef02fef
Hunting down mantis #5365
...
Revert "refactor: remove redundant null checks"
This reverts commit 6e58996b4d
2011-02-07 07:45:03 -08:00
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
Diva Canto