SignpostMarv
87f9aa9d08
porting IDE tooltip-friendly documentation tweaks from Aurora-Sim
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
Justin Clark-Casey (justincc)
f4cd4c8e28
Comment out accidentally left in log line that was printing out the control file on OAR save
2012-05-24 04:33:36 +01:00
Justin Clark-Casey (justincc)
38ce9d45a5
Make ISimulationScene.GetScene() used the more efficient region id for lookup rather than the region handle.
2012-05-24 01:00:18 +01:00
Justin Clark-Casey (justincc)
459c7635af
If an agent is still registered as 'in transit' by the source region, don't allow an immediate teleport back.
...
This is to help relieve a race condition when an agent teleports then immediately attempts to teleport back before the source region has properly cleaned up/demoted the old ScenePresence.
This is rare in viewers but much more possible via scripting or region module.
However, more needs to be done since virtually all clean up happens after the transit flag is cleared .
Possibly need to add a 'cleaning up' state to in transit.
This change required making the EntityTransferModule and HGEntityTransferModule per-region rather than shared, in order to allow separate transit lists.
Changes were also required in LocalSimulationConnector.
Tested in standalone, grid and with local and remote region crossings with attachments.
2012-05-24 00:31:14 +01:00
PixelTomsen
bc543c1797
Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite
...
enable/disable this module:
Cap_EnvironmentSettings = "localhost" (for enable)
Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file)
or owerwrite in OpenSim.ini
mantis: http://opensimulator.org/mantis/view.php?id=5860
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-23 17:04:19 -04:00
BlueWall
b490050165
Format cleanup
2012-05-23 16:58:04 -04:00
BlueWall
682d4075e3
Fix llGetSimulatorHostname to return configured hostname
2012-05-23 15:08:39 -04:00
Justin Clark-Casey (justincc)
4d1986c0e4
minor: Change [OBJECT COMMANDS MODULE] log strings to [REGION COMMANDS MODULE] strings, though all these are currently commented out anyway
2012-05-23 04:20:54 +01:00
Justin Clark-Casey (justincc)
ee98b9c394
Add "show scene" command which lists stats for the currently selected console scene(s)
...
This includes prim count, script count, avatar count, etc.
Information is currently the same as "show stats", though show stats can only show one scene at a time because it listens for the latest outgoing stats packet (a bad approach that needs to change).
Might be better to tie this module into the other stats module to display arbitrary stats rather than fetching directly from scene.SimStatsReporter.
Console command is "show scene" because "show region" already exists for the grid service, which is unfortunate.
Might need to make a distinction between "scene" relating to a live scene and "region" relating to more static region data (url, coords, etc.)
2012-05-23 04:10:45 +01:00
Justin Clark-Casey (justincc)
8f88c17df9
refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn
2012-05-23 03:23:37 +01:00
Justin Clark-Casey (justincc)
059a1e90b9
Add ConsoleDisplayList for more consistent formatting of console output in list form.
...
Convert "show region" to use this structure rather than hand-constructing
2012-05-23 03:19:25 +01:00
Justin Clark-Casey (justincc)
2222d979cc
refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity
2012-05-23 02:37:38 +01:00
Justin Clark-Casey (justincc)
c6ce41bfba
Add missing Y co-ord in "show region" console command information
2012-05-23 02:31:53 +01:00
Justin Clark-Casey (justincc)
050007b44d
Lay out "show region" information in an easier to read line by line format
2012-05-23 02:30:16 +01:00
Justin Clark-Casey (justincc)
68918d632f
Fetch the dialog module reference in AttachmentsModule in RegionLoaded() not AddRegion()
...
The reference is not guaranteed to be there when AddRegion() is called but will definitely be present at RegionLoaded() if it's going to be present at all.
2012-05-23 02:09:31 +01:00
Justin Clark-Casey (justincc)
ec8745cf51
minor: Make log class names in InventoryAccessModule uniform
2012-05-23 02:05:48 +01:00
Justin Clark-Casey (justincc)
ff429a259b
Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene.
...
This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All
Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
2012-05-23 01:58:10 +01:00
Justin Clark-Casey (justincc)
9ab0c81c1d
Setting 'in transit' on a local teleport as well as inter-region teleports.
...
This is to eliminate possible race conditions if two teleport calls are made concurrently, where at least one is a local teleport.
This is pretty much impossible on a manual user teleport but can happen on script-invoked teleports.
2012-05-21 21:33:59 +01:00
Justin Clark-Casey (justincc)
7e97f0e898
minor: extend commented out LinkInventoryItem log message for future use
2012-05-21 21:00:22 +01:00
Justin Clark-Casey (justincc)
16d303f7cd
Fix bug where outfit folders could not be renamed.
...
Outfit folders are a type of system folder whose details are allowed to change.
2012-05-21 19:38:43 +01:00
UbitUmarov
d2260423e5
also don't collide sculps or meshs if meshing is OFF
2012-05-21 17:11:19 +01:00
UbitUmarov
b92ecc5382
Merge branch 'avination' into ubitwork
2012-05-21 12:47:28 +01:00
ubit
4bbd5fa800
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-21 13:37:34 +02:00
UbitUmarov
85f5789993
try to let avas climb higher steps. Will only work in some cases, may have bad effects, so needs some more testing
2012-05-21 12:35:17 +01:00
Melanie
7305d2e0ef
Merge branch 'ubitwork' into avination
2012-05-21 07:32:27 +02:00
UbitUmarov
32e63fc04f
missing update script events call
2012-05-20 17:30:01 +01:00
UbitUmarov
11f582b26d
minor changes
2012-05-20 13:18:15 +01:00
ubit
e6d228dc0d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 19:16:17 +02:00
UbitUmarov
2767574d0f
fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable value ( 1m);
2012-05-19 18:10:44 +01:00
ubit
944f2c57fa
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 17:37:56 +02:00
UbitUmarov
10889c86d9
reduce useless waste of cpu. Make character collision events be done similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
2012-05-19 16:35:48 +01:00
ubit
51f6456442
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 14:55:43 +02:00
UbitUmarov
2c498baf58
a bit faster collision sound type verification plus a few fixes/changes
2012-05-19 13:53:49 +01:00
Melanie
768e495147
Merge branch 'master' into careminster
2012-05-19 13:35:21 +01:00
Melanie
ebd9d2618b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
2012-05-19 13:34:44 +01:00
ubit
cfbd37a4b0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 13:28:29 +02:00
UbitUmarov
a2c64d9795
temp work: sounds simetric acording to materials, still 'window close' test sound. Included in coment full assimetric ( since seems we have files for it now ) case with some uuids
2012-05-19 12:25:31 +01:00
Melanie
d69f197a5d
Fix setting positions of attachments. The recent security fix regarding
...
prim entry messed it up.
2012-05-19 12:35:07 +02:00
Justin Clark-Casey (justincc)
0db60eea85
Improve locking of RegionCombinerModule.m_regions
2012-05-19 04:59:36 +01:00
Justin Clark-Casey (justincc)
5759313f7f
Add size of region to OAR control file. Megaregions (sw root OARs when saved) will have a size larger than 256x256
...
Not yet read. Do not rely on this information yet, it may change.
2012-05-19 04:56:47 +01:00
Justin Clark-Casey (justincc)
824a3a114b
refactor: Add RegionConnection.PosX and PosY to return position in meters rather than copy/pasting the necessary calculations in lots of places.
2012-05-19 04:22:30 +01:00
Justin Clark-Casey (justincc)
fb8705dd4d
refactor: Rename connection paramaters from "conn" and "regionConnections" so that it's easy to tell whether they refer to the root region connection or a new region connection
2012-05-19 04:01:05 +01:00
Justin Clark-Casey (justincc)
d7f90dee1c
Correct some log messages in RegionCombinerModule about the position of the root region of a megaregion relative to an added region
2012-05-19 03:56:25 +01:00
Justin Clark-Casey (justincc)
4e5ac27928
Make the megaregion total area given to the physics module accurate instead of over-inflated.
...
This was previously over-inflated because adding a region to the NE of the root region resulted in double counting of regions already added.
An accurate extent will also be necessary for other purposes.
2012-05-19 03:45:58 +01:00
Justin Clark-Casey (justincc)
3f2a727b6d
Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be more than one megaregion in a simulator, separated by water.
...
Rename IsRootRegion() to IsRootForMegaregion()
2012-05-19 03:17:21 +01:00
Justin Clark-Casey (justincc)
26dfcf5395
Add some method doc to RegionCombinerModule. Clean up log messages.
2012-05-19 03:07:24 +01:00
Justin Clark-Casey (justincc)
33247c8d85
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-19 02:46:37 +01:00
Justin Clark-Casey (justincc)
2b60a5c5d6
Add is_megaregion flag into oar control file. Not currently read - for future use. Please do not rely on this remaining here.
...
An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975 , thanks!
Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data).
This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
2012-05-19 02:45:17 +01:00
ubit
b94ed8e1cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 03:05:16 +02:00
UbitUmarov
9ecdef2686
modulate collision sound intensity with collision relative velocity for parts also
2012-05-19 02:04:10 +01:00