Dan Lake
4f8f44d9c3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 15:21:37 -08:00
Dan Lake
ea19e50919
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-02-03 15:21:07 -08:00
BlueWall
0742630d81
Merge branch 'master' of /home/opensim/src/opensim
2012-02-03 18:20:26 -05:00
Dan Lake
107cef2b0e
Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before triggering events on a potentially null Scene
2012-02-03 15:18:48 -08:00
Justin Clark-Casey (justincc)
ce34b359ad
Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene presence and population of m_avatars.
...
This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated.
Extending the lock is the easiest to understand solution rather than getting complicated with null checks.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
2012-02-03 23:04:26 +00:00
PixelTomsen
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
Snoopy Pfeffer
83ef13a79a
Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter
2012-02-03 23:53:18 +01:00
Justin Clark-Casey (justincc)
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
Justin Clark-Casey (justincc)
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
Snoopy Pfeffer
1a18948935
Corrected console help texts for "save iar"
2012-02-03 23:04:18 +01:00
Melanie
0dbfa70443
Merge branch 'master' into careminster
2012-02-03 08:47:26 +00:00
Dan Lake
61adf36339
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
2012-02-02 18:19:22 -08:00
Dan Lake
ed846f11f1
OpenSim tests do not always create an EventManager so calls to trigger events during tests must check for null EventManager
2012-02-02 18:06:34 -08:00
Dan Lake
3257dbe76d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-02 17:44:11 -08:00
Dan Lake
146d78edfa
ObjectAddedToScene event should be fired when duplicating objects
2012-02-02 17:41:05 -08:00
Dan Lake
ee2b2aadc3
fix line endings
2012-02-02 17:39:05 -08:00
Melanie
bce5dfe711
Merge branch 'master' into careminster
2012-02-03 00:09:05 +00:00
Melanie
76a658324c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-03 00:07:23 +00:00
Melanie
573a64ad24
Merge branch 'master' into careminster
2012-02-03 00:05:59 +00:00
Melanie
574c240202
Fix test failure
2012-02-03 00:05:36 +00:00
Melanie
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
Justin Clark-Casey (justincc)
54d473e200
D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLinkNumber().
2012-02-02 23:35:16 +00:00
Justin Clark-Casey (justincc)
264c83aec4
Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api
...
It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
2012-02-02 22:48:36 +00:00
Melanie
8f8b5f9a4d
Merge branch 'master' into careminster
2012-02-02 22:36:41 +00:00
Melanie
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
Justin Clark-Casey (justincc)
17df4185ce
Add stress tests for simple object add of 100 prim objects. Add time taken to output (this is unreliable).
2012-02-02 18:42:27 +00:00
Diva Canto
dbf6381e34
OpenID: server connector had a copy-and-paste error that made identity queries fail.
2012-02-02 08:39:23 -08:00
Melanie
fd7e82ee72
Streamline banning code using existing methods.
2012-02-02 16:51:39 +01:00
Melanie
857d4e60cc
Rehook the eject and freeze events that had gotten unhooked in the merge
2012-02-02 13:46:46 +01:00
Melanie
567f4c51f8
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:52:17 +00:00
Melanie
6fe4b6fbe8
Fix remembering attachment point and position when an item is rezzed in world.
...
Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script
in the root.
2012-02-02 02:51:59 +01:00
Melanie
dbc3f1ff92
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-02-02 01:53:13 +00:00
Dan Lake
0ce9ad4a56
Add event RegionHeartbeatEnd for modules interested in coordinating activity with region heartbeats
2012-02-01 17:01:28 -08:00
Dan Lake
c10193c72b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-01 16:25:35 -08:00
Melanie
45ad9e39a6
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:05:14 +01:00
Melanie
e5ae84b42b
Re-Add the reading of attachment data hat was lost in the merge
2012-02-02 01:04:54 +01:00
Melanie
16aa00e944
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-01 10:08:45 +00:00
Melanie
003bd9f1b3
Small optimization to last commit
2012-02-01 10:05:04 +00:00
Melanie
cc1476fc36
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-01 09:45:42 +00:00
Melanie
241ddd031f
Fix copy/paste errors
2012-02-01 09:45:15 +00:00
Melanie
c08d6df7e1
Prevent a changed attachment that has been saved from being saved again.
2012-02-01 09:38:20 +00:00
Melanie
fcc1fa2c32
Straighten out some attachment mess. Don't save attachment states for HG
...
visitors at all. On Leaving a sim, save only the changed ones. Don't save
all scripted stuff when leaving a sim.
2012-02-01 09:36:14 +00:00
Diva Canto
3d7b5e5e93
HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri.ToString() drops the port when it's port 80.
2012-01-31 22:00:59 -08:00
Justin Clark-Casey (justincc)
99e71222f0
Lay out script status in property per row format, since getting too long for console lines.
2012-02-01 00:27:42 +00:00
Justin Clark-Casey (justincc)
e3680f216e
Add count of events queued for a particular script in "scripts show" console command
2012-02-01 00:17:02 +00:00
Justin Clark-Casey (justincc)
8b3da1bff4
Make script console commands only show for selected region.
2012-02-01 00:10:07 +00:00
Justin Clark-Casey (justincc)
437de6743c
Implement "xengine status" console command to show various xengine stats
2012-02-01 00:07:06 +00:00
Justin Clark-Casey (justincc)
f028dca711
Add "show part uuid" and "show part name" console commands.
...
These commands will display part/prim details for a given uuid or name
The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset).
This is for consistency with the "delete object" commands which only delete objects, not parts.
2012-01-31 23:35:13 +00:00
Justin Clark-Casey (justincc)
996cc6097e
Implement "show object name <name>" console command to show details of an object with the given name
2012-01-31 23:21:02 +00:00
Justin Clark-Casey (justincc)
ac7cded080
Get rid of the "no objects found" feedback for now - this doesn't work well if a command is executed over multiple scenes.
2012-01-31 23:06:48 +00:00
Justin Clark-Casey (justincc)
ab89adfaef
Implement "show object uuid <uuid>" console command.
...
This will show details about a part with the given uuid if it's found.
2012-01-31 23:03:39 +00:00
Justin Clark-Casey (justincc)
647b326edc
Add more user feedback if an object isn't found for which delete was requested.
2012-01-31 22:27:05 +00:00
Justin Clark-Casey (justincc)
77b032549e
Add the name of a deleted object to the console output
2012-01-31 22:22:32 +00:00
Justin Clark-Casey (justincc)
e3e38e34c5
If a particular region is selected in the console, only try to delete objects in that region, rather than in every region on the simulator
...
The old wrong behaviour was in place before the command was extracted to a module.
2012-01-31 22:21:10 +00:00
Justin Clark-Casey (justincc)
9bd02b5da1
Move object delete commands into a commands region module, in preparation for adding similar show commands.
2012-01-31 21:57:45 +00:00
Melanie
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00
Justin Clark-Casey (justincc)
2f84d5397b
minor: remove mono compiler warning
2012-01-31 21:14:09 +00:00
Justin Clark-Casey (justincc)
1505c22995
Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
...
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
2012-01-31 21:09:26 +00:00
Melanie
d76ca9cd93
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-31 20:54:04 +00:00
Melanie
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
Justin Clark-Casey (justincc)
10b9348071
Remove scene object null check on SceneGraph.AddSceneObject(). Complain explicitly if there's an attempt to add any object with a zero UUID.
...
Callers themselves need to check that they're not attempting to add a null scene object.
2012-01-31 20:30:30 +00:00
Justin Clark-Casey (justincc)
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
PixelTomsen
a98a146c50
Fix:llSetText - limited text to a maximum of 254 chars
...
mantis: http://opensimulator.org/mantis/view.php?id=5867
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-31 10:17:38 -07:00
Melanie
c305b55012
Draw brders around parcels for sale
2012-01-31 06:31:02 +01:00
Melanie
d2dfa4cfe7
Make parcel sale overlays work. No auction support.
2012-01-31 03:09:44 +00:00
Melanie
71012ef883
Make parcel sale overlays work. No auction support.
2012-01-31 02:19:34 +01:00
Melanie
fe0975dc24
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-30 21:39:36 +00:00
Melanie
2b84b6d8b1
Use the requested sim's map, not our own
2012-01-30 21:39:12 +00:00
Justin Clark-Casey (justincc)
dbc039783b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-30 21:34:40 +00:00
Melanie
a0206e5a17
Comment debug spam
2012-01-30 22:30:20 +01:00
Melanie
0f181fe5d0
Fix displaying landmark and search info properly with long names
2012-01-30 22:30:02 +01:00
Melanie
cfe924e4a8
Merge branch 'master' into careminster
2012-01-30 21:40:50 +00:00
Melanie
e1cad4c34f
Use the requested sim's map, not our own
2012-01-30 21:38:46 +00:00
Melanie
9dbb58ee8b
Merge branch 'master' into careminster
2012-01-30 21:26:47 +00:00
Melanie
53c3faac5d
Patch in the rest of the maptile stuff
2012-01-30 21:24:21 +00:00
Melanie
c4cc626dff
Add the needed column in the regions table and a few tweaks.
...
Warning: Contains a Migration
Warning: Cannot guarantee nut free
2012-01-30 20:34:32 +00:00
Melanie
bde2ff5e78
Next step for world map overlays
2012-01-30 20:11:47 +00:00
Melanie
df9c35bc0f
Some plumbing for map overlays
2012-01-30 19:46:55 +00:00
Justin Clark-Casey (justincc)
9d93c4808e
lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if SceneObjectGroupsByFullID is updated elsewhere at the same time.
2012-01-30 19:21:58 +00:00
BlueWall
54e6b2402c
Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"
...
This reverts commit 00d1c88c59
.
Need to dig a little deeper to see exactly how V1 viewers are using this
2012-01-30 12:39:08 -05:00
BlueWall
00d1c88c59
Pickup map overlay tile from RegionSettings.ParcelImageID
2012-01-30 11:49:22 -05:00
Melanie
ad02e01e77
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-30 16:44:26 +00:00
Melanie
1b600e7803
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-30 16:38:11 +00:00
Melanie
3de534896e
Add ParcelImageID to RegionSettings so we can have that overlay.
...
Warning: Contains a Migration.
Warning: May contain nuts.
2012-01-30 16:22:21 +00:00
Melanie
9a86a713d3
Merge branch 'master' into careminster
2012-01-29 22:50:59 +00:00
Garmin Kawaguichi
5e60afe5ed
Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/view.php?id=5865
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 14:41:47 -07:00
PixelTomsen
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 12:40:43 -07:00
Melanie
7c824f02b4
Add the ability to abort a pending restart using the viewer UI or a
...
RemoteAdmin message
2012-01-28 22:19:10 +01:00
Melanie
498fe1afe7
Fix calculating land prim count type width issue
2012-01-28 21:23:54 +01:00
Melanie
dac826da4e
Prevent an overlong description from messing up a ParcelInfoReply
2012-01-28 20:38:50 +01:00
BlueWall
f7c237c0e1
Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork
2012-01-28 11:35:28 -05:00
BlueWall
ae057a7589
Adding our parcel's generated id to map packets
2012-01-28 10:36:39 -05:00
BlueWall
1a20b60d82
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 08:47:25 -05:00
Bo Iwu
2e31f12cf4
Send CHANGED_TELEPORT during local TP again - partially revert cf73afec35
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-28 08:43:58 -05:00
Justin Clark-Casey (justincc)
2ef9fd05fa
Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry texEntry) for region modules
2012-01-28 02:45:13 +00:00
Melanie
6fbc48ee9c
Make all NPCs owned by default
2012-01-28 03:32:25 +01:00
Melanie
6db9109b3f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-28 03:22:36 +01:00
Melanie
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
Justin Clark-Casey (justincc)
154ba0124a
Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner.
2012-01-28 02:21:41 +00:00
Melanie
fbe324cc5e
Fix build break
2012-01-28 03:15:17 +01:00
Melanie
090164ff7a
Completely disable NPC being sensed as agents, the abuse potential is too great
2012-01-28 03:12:56 +01:00
Melanie
428407c5e4
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
Justin Clark-Casey (justincc)
e391d6390c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 00:44:11 +00:00
Justin Clark-Casey (justincc)
deeb7287a2
Comment out xfer section in Scene.UpdateTaskInventory() which was causing spurious errors and "script saved" messages when script properties were changed.
...
Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes.
It's unknown whether the commented out code was working for very old viewers or not.
Code is commented out to reduce complexity and so that useful error messages don't need to be removed.
If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
2012-01-28 00:39:53 +00:00
Melanie
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
Justin Clark-Casey (justincc)
7837c611fb
Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().
...
This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension).
Wiki doc on this and other recent NPC functions will follow soon
2012-01-28 00:00:12 +00:00
Melanie
26a4e8a161
Merge branch 'master' into careminster
2012-01-27 23:30:26 +00:00
Justin Clark-Casey (justincc)
31b87ff07b
Increment LPS script stat for OSSL functions that were not already doing this
2012-01-27 23:24:49 +00:00
Justin Clark-Casey (justincc)
7c1d075a5a
Implement osIsNpc(key npc):integer. This return TRUE if the given key belongs to an NPC in the region. FALSE if not or if the NPC module isn't present.
2012-01-27 23:17:13 +00:00
Justin Clark-Casey (justincc)
abf0dd4250
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-27 23:14:34 +00:00
Justin Clark-Casey (justincc)
9939f94f08
Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc.
...
llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return.
Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
2012-01-27 23:05:48 +00:00
Melanie
86b9e6fbed
Merge branch 'master' into careminster
2012-01-27 19:47:24 +00:00
Diva Canto
91ac21b9ec
HG Inventoty: Guard against items not found.
2012-01-26 17:00:58 -08:00
Melanie
9d60b84f78
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/EstateSettings.cs
2012-01-26 23:07:31 +00:00
BlueWall
6da82d9805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-26 16:29:39 -05:00
PixelTomsen
616373db16
llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageEstateAccess
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-26 16:15:23 -05:00
Melanie
7229f6e64b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-01-26 10:32:22 +00:00
Melanie
da720ce9be
Support rejecting a teleport if a user is banned in all parcels that have
...
spawn points
2012-01-26 10:21:45 +00:00
Melanie
a537f7e1a3
Merge branch 'master' into careminster
2012-01-26 09:10:46 +00:00
BlueWall
a6abecf5fa
Change references from sop to sog and add protection from null ref
...
I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes.
2012-01-26 00:33:34 -05:00
Justin Clark-Casey (justincc)
093469c33c
Add basic TestAddScript() regression test
2012-01-26 01:16:03 +00:00
Melanie
36e6edfc65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-01-26 00:44:32 +00:00
Justin Clark-Casey (justincc)
13d9b64b1d
Re-enable error logging associated with assembly and script loading failure in ScriptInstance.
...
Swallowing exceptions just leads to more mysterious failures later on.
2012-01-26 00:28:51 +00:00
Melanie
4ce42762ee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
Justin Clark-Casey (justincc)
55c6cbabfd
refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInventoryItem() to accept an agent id rather than a full IClientAPI.
...
This stops some code having to make spurious client == null checks and reduces regression test complexity.
2012-01-26 00:10:37 +00:00
Justin Clark-Casey (justincc)
8e5502fdc2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-25 23:24:44 +00:00
Justin Clark-Casey (justincc)
2de3a1b9da
refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim()
2012-01-25 23:22:07 +00:00
nebadon
d053625663
Update save oar and save iar help responses to reflect new -h|--home
...
switches which replace -p|--profile ie: "save oar
--home=http://hg.osgrid.org:80 region.oar"
2012-01-25 15:59:07 -07:00
Robert Adams
e9de7e7107
Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface.
2012-01-25 14:40:38 -08:00
Justin Clark-Casey (justincc)
2e7c1bcfd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-25 21:26:34 +00:00
Pixel Tomsen
8f53c768f5
llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-25 15:48:38 -05:00
Justin Clark-Casey (justincc)
82c3d0cf89
minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates bin/LocalUserStatistics.db
2012-01-25 20:36:51 +00:00
Justin Clark-Casey (justincc)
e20cf3789b
Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region.
...
It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches.
For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider.
This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads.
ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately.
2012-01-25 19:31:50 +00:00
Melanie
7444f3bfad
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2012-01-25 15:02:54 +00:00
Melanie
f84b69cad1
Change the WorldMapModule to use SOG rather than SOP for the telehub ans
...
cover a potential nullref
2012-01-25 15:00:06 +00:00
Melanie
b996517c94
Typo fix
2012-01-25 15:18:31 +01:00
Melanie
24862eaf15
Spin off starting scripts in rezzed objects into a thread to avoid a recursion
...
into the script engine if the script was suspended inside an event.
2012-01-25 14:44:09 +01:00
Melanie
2ca80add14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 15:24:25 +00:00
BlueWall
959bcfa7f8
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 21:35:12 -05:00
BlueWall
7c514fe155
Telehub map items displayed
2012-01-24 21:33:11 -05:00
Dan Lake
3d1f43046d
Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreateDelegate, ObjectDeleteDelegate
2012-01-24 17:05:53 -08:00
Melanie
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
Justin Clark-Casey (justincc)
2d0412d366
Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly.
2012-01-24 22:35:55 +00:00
Justin Clark-Casey (justincc)
8e0eaa980f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:16:45 +00:00
Justin Clark-Casey (justincc)
09baa3e679
Comment out asset statistics section from periodic stats as these have not been recorded for a very long time.
...
Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness.
Some data is available via other means (e.g. "fcache status").
2012-01-24 22:14:21 +00:00
BlueWall
3ae6345f1b
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 17:14:08 -05:00
BlueWall
dc329202ef
Put Telehubs on the map
2012-01-24 17:11:35 -05:00
Justin Clark-Casey (justincc)
5e445aaf7b
Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTICS to count the number of times clients are disconnected due to ack timeouts.
...
This has been broken for a long period and would only ever show 0.
2012-01-24 22:09:13 +00:00
Justin Clark-Casey (justincc)
ab8956d58f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:04:28 +00:00
Justin Clark-Casey (justincc)
e8f1e7e96e
Comment out inventory statistics section from periodic stats, since this only contained the now uncollected and irrelevant inventory cache number.
2012-01-24 22:03:30 +00:00