a62ccb5c4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-03 20:12:10 +00:00
40a1eddfd1
Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size
...
not a target size. Mono 2.10 appears to try to allocate the full buffer which
immediately crashes. Tested on mono 2.6.7 and 2.10.5
2011-11-02 18:55:54 -07:00
457195466d
Merge branch 'master' into bigmerge
2011-11-03 00:23:58 +00:00
6b4ae4f30c
Revert "fix CopyTo call that was breaking under mono 2.10"
...
This reverts commit d30971fdc2
2011-11-03 00:23:32 +00:00
99a347ee11
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-02 17:11:10 -07:00
d30971fdc2
fix CopyTo call that was breaking under mono 2.10
2011-11-02 17:10:59 -07:00
e746840226
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-02 23:51:48 +00:00
08fcf958c2
Port the Avination offline messaging system to Core
2011-11-02 23:50:47 +00:00
26a4f32013
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-02 23:42:37 +01:00
afde92d8cc
Merge branch 'master' into bigmerge
2011-11-03 00:07:29 +00:00
243acef917
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
52d8fa2d0f
Merge branch 'master' into bigmerge
2011-11-02 23:51:12 +00:00
ce8419fdd0
Fix link order when linking sets to sets
2011-11-02 23:42:09 +01:00
a724ebacd7
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-02 14:59:34 -07:00
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
59232a6ea8
Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.
...
If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
2011-11-02 20:05:31 +00:00
72923134e9
Get some hopefully more useful exception information when OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
2011-11-02 18:40:49 +00:00
03993d0b14
Fix race condition that would sometimes send or save appearance for the wrong avatar.
...
In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread.
If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched.
This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent.
This change loads the fields into local references so that this doesn't happen.
2011-11-02 18:25:03 +00:00
b6873a7b5d
Catch any exceptions exiting the top of the robust console, as we already do for the main simulator.
...
This prevents issues such as transient mono console problems from crashing the server.
2011-11-02 13:16:02 +00:00
afae9eafbe
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 12:34:57 +00:00
c5fb39e21f
Restore the recursive calling of PRIM_LINK_TARGET because the version I made
...
breaks LINK_SET et al.
2011-11-02 12:09:18 +00:00
1b9ae3fb51
Some positioning fixes from AVN trunk
2011-11-02 12:02:44 +00:00
c55e161dc4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 11:49:25 +00:00
b9e700b60d
Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario
2011-11-02 11:43:16 +00:00
7c8bfac11b
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
2011-11-01 17:20:12 -07:00
3bead3eb50
Part 2 of see_into_this_sim_from_neighbor configuration option removal
2011-11-01 17:11:43 -07:00
9a8715ec9a
Merge branch 'master' into bigmerge
2011-11-02 00:07:59 +00:00
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
4b58d4ff95
Removed see_into_this_sim_from_neighbor configuration option.
2011-11-01 16:51:14 -07:00
9456a540c5
Add "appearance send" command to allow manual sending of appearance.
2011-11-01 23:23:45 +00:00
8e2e4c47d9
Add "show status" command to pCambot
2011-11-01 22:09:21 +00:00
40750b44a0
Listen only for non SimShutdown Network.Disconnect firing so that we don't quite the program before all bots have actually logged off.
2011-11-01 21:47:14 +00:00
53f3b76a84
get rid of unused m_verbose field
2011-11-01 21:18:28 +00:00
12bd0ebd34
stop recording the threads on which we happen to start bots. These are pointless since they terminate quickly
2011-11-01 21:15:47 +00:00
9ef5107157
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-01 21:02:03 +00:00
87ec8a4ecb
Retain a reference to an action thread rather than starting an infinite loop via a timer, so that we can actually abort the action thread on shutdown
2011-11-01 18:36:29 +00:00
9d214d4903
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 16:42:50 -07:00
3c55f3015f
Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules.
2011-10-31 16:42:28 -07:00
b951c7fb1e
Make bots share a cache so that asset downloads attempts are only made once instead of once for each bot
2011-10-31 23:22:55 +00:00
210868a832
Remove OpenSim.TestSuite
...
Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
2011-10-31 23:10:10 +00:00
d366a08ebb
Stop individual bots attempting to download the same asset more than once
2011-10-31 22:52:49 +00:00
0c6509098a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-31 22:27:35 +00:00
43e07efbc8
Fix bot disconnection
2011-10-31 22:27:12 +00:00
3a2dcc7298
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 15:21:39 -07:00
d3153f47fa
Adding green dots to map response should be for root agents only
2011-10-31 15:20:57 -07:00
b1647f6d04
adjust pCampbot so it starts up bots with the name format "<firstname> <lastname>_<bot-number>"
...
e.g. starting up two bots called "Ima Bot" will give them the names "Ima Bot_0" and "Ima Bot_1"
This is necessary since bots with random names can no longer be created, as there's no easy way to turn off account authentication
2011-10-31 22:14:49 +00:00
74cc834fec
Remove unused PumaCode.SvnDotNet library
2011-10-31 21:37:35 +00:00
e3f51df3c2
Stop pCampbot from firing connected event twice, which results in double counting.
2011-10-31 21:33:25 +00:00
a9a24062a5
Plug a security hole in the inventory service
2011-10-31 11:11:36 +00:00
4002e205cb
Merge branch 'master' into bigmerge
2011-10-31 10:53:17 +00:00
Justin Clark-Casey (justincc)