Melanie
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
Justin Clark-Casey (justincc)
1d01c91095
minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs
2010-08-23 23:21:44 +01:00
Justin Clark-Casey (justincc)
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
Melanie Thielker
32ddeab5e3
Add printing the default script engine name. Report real exceptions when
...
there is an issue with the config file, as a typo could cause configuration to
silently fail.
2010-08-22 14:26:58 +02:00
Melanie Thielker
071edaff49
Suppress error messages about scripts not foind if they're in fact disabled
2010-08-22 13:51:15 +02:00
Melanie
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
Diva Canto
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
Diva Canto
6f83b0ee46
Cleaned up a few more things related to incoming agents.
2010-08-20 09:02:05 -07:00
Melanie
82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
Melanie
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
Melanie Thielker
47838e5fb3
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:46:46 +02:00
Diva Canto
a39ea07158
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
Melanie
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
Justin Clark-Casey (justincc)
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
meta7
ca8b1e488c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-18 02:53:27 -07:00
Melanie
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
Melanie Thielker
f2d7f3e731
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-14 14:00:12 +02:00
Melanie Thielker
a32b0ce0ae
Fix a possible nullref in BestAvatarResponsiveness policy
2010-08-14 13:59:36 +02:00
randomhuman
8eeb3f2fd2
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
2010-08-13 23:29:01 +01:00
Justin Clark-Casey (justincc)
ab6dc47818
refactor: move binary statistics logging from scene into separate region module
2010-08-13 23:15:11 +01:00
Justin Clark-Casey (justincc)
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
Justin Clark-Casey (justincc)
b30635a454
Establish new Objects/BuySellModule
...
Move Scene.ObjectSaleInfo() to this
2010-08-13 21:39:43 +01:00
Justin Clark-Casey (justincc)
5d20f04e08
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
2010-08-13 21:18:26 +01:00
Justin Clark-Casey (justincc)
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
Justin Clark-Casey (justincc)
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
Justin Clark-Casey (justincc)
39a748b47a
refactor: Use SOP.Flags rather than SOP.ObjectFlags
2010-08-13 20:23:53 +01:00
meta7
b43a731beb
Fix a nullref exception in the prioritizer
2010-08-12 05:40:41 -07:00
Diva Canto
c98c6a2930
File wants to be committed
2010-08-11 20:38:10 -07:00
meta7
24577876be
Add some console debug to help fix a threadlock issue.
2010-08-11 14:10:47 -07:00
meta7
ac581b532e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-11 13:40:31 -07:00
meta7
fa393cb13a
Fix Omega getting overwritten on startup.
2010-08-11 13:39:36 -07:00
Melanie Thielker
d00a954d35
Log the state of the prejump flag
2010-08-11 03:09:56 +02:00
Marck
4f62f00ca0
Changing prim color generates event CHANGED_COLOR.
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-08-10 19:38:39 +01:00
Mikko Pallari
3f942a4f74
Removed abstract SetText method from EntityBase to make cleaner API.
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-08-10 19:37:15 +01:00
Melanie
75f92faeb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-10 19:34:57 +01:00
Justin Clark-Casey (justincc)
2a1c11fda9
On shift-copy of an object, set up a new physics actor (as appropriate) for every copied prim, not just the root
...
This addresses http://opensimulator.org/mantis/view.php?id=4295
2010-08-10 20:15:44 +01:00
Marck
6147efdad9
Avoid truncation of error message during region creation.
...
Signed-off-by: Melanie <melanie@t-data.com >
2010-08-10 19:34:09 +01:00
meta7
1582e05ac7
Fix a nullref issue in the AgentSetAppearance packet handler when removing the physactor from the scene
2010-08-10 09:55:40 -07:00
Justin Clark-Casey (justincc)
0a81038dd5
Reduce number of paths in SOP code by setting flags via Flags property rather than _flags
...
Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags
Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway.
Deprecated ObjectFlags in favour of Flags.
2010-08-10 17:26:31 +01:00
meta7
fb14390fb0
Note to self: don't break the build
2010-08-10 09:17:30 -07:00
meta7
9fba4b66bb
Resolve merge failure
2010-08-10 09:11:55 -07:00
Melanie
24b9a2885f
Resolve merge issues
2010-08-10 20:11:55 +01:00
Melanie
c2e5d1d203
Merge branch 'master' into careminster-presence-refactor
2010-08-10 19:49:35 +01:00
Melanie
383ee0d647
Remove 4000+ DOS line endings. Grrr!
2010-08-10 19:48:45 +01:00
Melanie
d98d5ee6be
Remove windows line endinge
2010-08-10 19:42:18 +01:00
meta7
1ead2ed5ee
Add a stack trace to the error output on the recursive read lock warning on my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into.
2010-08-10 09:07:17 -07:00
Justin Clark-Casey (justincc)
7203feb83c
Extend DuplicateObject() test to check flags on the duplicated object
2010-08-10 16:50:36 +01:00
Justin Clark-Casey (justincc)
85fc2dfe3c
extend TestDuplicateObject() to a two prim object
2010-08-10 16:16:57 +01:00
Melanie Thielker
0f9eebdfb1
Change prejump from hardcoded true to default true so it can be disabled.
...
It completely destroys roleplay jumping
2010-08-10 03:52:00 +02:00
Melanie Thielker
f20dc512e8
Whitespace conflict
2010-08-09 02:46:09 +02:00
