Melanie Thielker
457160afc3
Fix an issue with rezzing scripted objects.
2010-09-03 03:16:08 +02:00
Kitto Flora
24c73aa8b2
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-02 21:51:27 +00:00
Kitto Flora
16814dd8f1
Fixes to JUMP system.
2010-09-02 21:51:19 +00:00
Melanie Thielker
5ea979d515
Remove commented code and the comment, as the change has proven out
2010-09-02 20:51:27 +02:00
Melanie Thielker
eea5d8368a
Experimentally comment the sending of unbaked avatars
2010-09-02 20:08:39 +02:00
Melanie Thielker
713c666827
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:49:42 +02:00
Melanie Thielker
0f40ec5c65
Implement UploadBakedTexture cap
2010-09-02 16:10:44 +02:00
Melanie Thielker
db015963a9
Remove the annoying "Script saved" popups when saving scripts in task
...
inventory. They cause spam when using recompile scripts in selection
and are redundant because that message is also shown in the script window
message pane. These popups were a legacy from when we couldn't drive the
message pane and their finest hour has now come.
2010-09-02 14:17:33 +02:00
Melanie Thielker
09fba16094
Prevent Meta7 plants from being treated like dropped attachments and removed
...
from the sim.
2010-09-01 20:10:44 +02:00
Melanie Thielker
2232e6f273
Improve sim health reporting. Output error message if heartbeat thread is restarted by scene. This may help to find out why this recovery mechanism isn't working.
2010-09-01 14:08:52 +02:00
Melanie Thielker
aca10cb027
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-31 22:26:17 +02:00
Melanie Thielker
b973fe5297
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:24:11 +02:00
meta7
35d6181b78
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-30 11:42:17 -07:00
meta7
4cf5ef3cd4
Kick the user from the region in the circumstance that the TP home failed - ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
2010-08-30 11:41:20 -07:00
Melanie
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
Melanie
8ee31d97a8
Remove CRLF endings
2010-08-30 02:19:21 +01:00
Melanie
eefb207c1b
Fix a casting operation to use ToString()
2010-08-30 02:10:11 +01:00
Melanie
0d6c2afce6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-30 02:08:48 +01:00
Jonathan Freedman
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
Jonathan Freedman
4b2e3bd6c3
local commit with parcel media bits
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 01:59:50 +01:00
Justin Clark-Casey (justincc)
374807d194
Replace hardcoded 0 with KickFlags provided by the client.
...
This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
2010-08-28 02:45:28 +01:00
Justin Clark-Casey (justincc)
83fbf66444
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-28 02:41:00 +01:00
Justin Clark-Casey (justincc)
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
Diva Canto
0f95cd209e
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
2010-08-27 17:25:04 -07:00
Justin Clark-Casey (justincc)
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc)
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
Justin Clark-Casey (justincc)
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
Justin Clark-Casey (justincc)
b4278510f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-27 22:53:02 +01:00
Justin Clark-Casey (justincc)
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
Diva Canto
0ca87a6f01
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-26 18:23:43 -07:00
Diva Canto
3c71e5a3a2
Deleted Check4096 from Robust.ini.example
2010-08-26 18:23:16 -07:00
Melanie
1f1d72eba5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-26 23:39:20 +01:00
Melanie
5b4e0b72bc
Send a null result search packet when no results are passsed in
2010-08-26 23:38:35 +01:00
Diva Canto
436fdc2ea8
More on mantis #4985
2010-08-26 14:48:29 -07:00
Diva Canto
6198fe53e6
Addresses mantis #4985 -- exceptions in DataSnapshot
2010-08-26 14:19:52 -07:00
Justin Clark-Casey (justincc)
fb6d761e19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-26 22:13:46 +01:00
Justin Clark-Casey (justincc)
7f5501d3ab
minor: remove mono compiler warning
2010-08-26 22:13:31 +01:00
Justin Clark-Casey (justincc)
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
Justin Clark-Casey (justincc)
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
Justin Clark-Casey (justincc)
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
Diva Canto
26fd673e20
Addresses mantis #4984 -- Datasnapshot exceptions.
2010-08-26 12:26:09 -07:00
Justin Clark-Casey (justincc)
fe660cd2cc
Rename Newtonsoft.Json.dll to properly reflect its actual assembly name
2010-08-26 18:11:01 +01:00
Justin Clark-Casey (justincc)
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
Justin Clark-Casey (justincc)
d99c60164d
Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.
...
On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
2010-08-26 16:06:34 +01:00
Justin Clark-Casey (justincc)
a6869fbc3e
Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()
...
By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
2010-08-26 15:33:42 +01:00
Justin Clark-Casey (justincc)
87a6554d4b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
Justin Clark-Casey (justincc)
692cf3c657
Remove parts locking from data classes since these are using a copy of the scene object
2010-08-26 00:17:26 +01:00
Justin Clark-Casey (justincc)
166ab59420
replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway)
2010-08-26 00:15:26 +01:00
Justin Clark-Casey (justincc)
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
Melanie Thielker
47818a2db3
Fix a horrible bug in SG, where iteration of scene objects is carried
...
out in a fashion that causes the delegate to be invoked once per child
prim for a given group.
2010-08-26 01:06:50 +02:00