7e97f0e898
minor: extend commented out LinkInventoryItem log message for future use
2012-05-21 21:00:22 +01:00
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
0464508a5b
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-20 14:09:03 -04:00
0db60eea85
Improve locking of RegionCombinerModule.m_regions
2012-05-19 04:59:36 +01:00
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
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
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
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
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
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
26dfcf5395
Add some method doc to RegionCombinerModule. Clean up log messages.
2012-05-19 03:07:24 +01:00
33247c8d85
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-19 02:46:37 +01:00
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
13187aca91
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-18 20:49:29 -04:00
247a56593f
Further refinement on properties
2012-05-18 20:02:32 -04:00
477b67e1e6
Further refinement on properties
2012-05-18 19:56:46 -04:00
e338c15433
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 19:34:19 -04:00
895dadbdbd
Cleanup + change properties to set fields with private set : Thanks Justin for the tip.
2012-05-18 19:34:12 -04:00
c990cfe481
Cleanup + change properties to set fields with private set : Thanks Justin for the tip.
2012-05-18 19:32:26 -04:00
9fa0577c7e
Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This appears to be required now for LL 3.3.1 to work properly.
...
Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log.
This cap will be ignored by older viewers - UDP inventory will work normally.
2012-05-19 00:00:52 +01:00
fc5d274229
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 23:56:44 +01:00
896cd45939
Fix issue where a new outfit folder is not created when a new outfit is saved if there are no previous outfits
...
This was because AddFolder() was disallowing these though they are legal.
2012-05-18 23:55:18 +01:00
c05f87b50c
Provide Telehub setting to allow use of landmarks
...
Setting to allow use of landmarks to override telehub routing. Default is off.
2012-05-18 17:51:38 -04:00
cf93f39b9f
Provide Telehub setting to allow use of landmarks
...
Setting to allow use of landmarks to override telehub routing. Default is off.
2012-05-18 17:47:00 -04:00
9cb242e24d
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-18 12:35:21 -04:00
0147dc6302
Fix build break. Comment out EQG deregister/register logging.
2012-05-18 03:50:23 +01:00
90722875e8
Add millisecond logging to pCampBot for debugging purposes
2012-05-18 03:44:31 +01:00
45af29291a
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-18 03:43:36 +01:00
565c73751c
Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging
2012-05-18 00:49:39 +01:00
6501b1b1bb
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
2012-05-18 00:38:29 +01:00
b18c8c8e78
Don't eagerly clear frame collision events when physics actors subscribe and unsubscribe from collisions, in order to avoid a race condition.
...
Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
2012-05-17 23:59:43 +01:00
521ad080f1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-17 23:56:36 +01:00
4d34763f8c
Check agent limit against root agent count rather than both root and child agents
...
From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115
agent should apply to avatars only.
This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources.
As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate.
This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed.
This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
2012-05-17 23:33:26 +01:00
5d860d09a3
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-17 08:00:16 -04:00
2af11fea37
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-05-17 00:49:33 -04:00
295bb3227d
Force the default Telehub router if no matches are found in the config.
2012-05-17 00:47:19 -04:00
bd39f5f803
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-16 23:20:37 -04:00
0aa7baf49a
Fix boo-boo in OpenSim.ini.example affecting telehub sequential routing
...
Configuration value should be "sequence" instead of "sequential"
2012-05-16 23:17:42 -04:00
c45b5a3d1c
minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:27:05 +01:00
d19fb6fb0c
Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:12:31 +01:00
8f0405bacc
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-16 21:08:01 -04:00
f0c9cb8dc0
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
2012-05-17 01:34:04 +01:00
6b6a00a3d5
minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator because checking EstateOwner == user
...
Due to an earlier check we already know that user != UUID.Zero so if EstateOwner == UUID.Zero, EstateOwner == user can never be true
2012-05-17 01:30:50 +01:00
bdcf2d1348
Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
2012-05-17 01:27:59 +01:00
e444cb9da4
Remove redundant "Teleport failed:" from reason when QueryAccess fails for the destination simulator. This part of the string is already provided by the viewer.
...
Also adds more reason logging for diagnostics when teleports are refused/fail.
2012-05-17 00:33:04 +01:00
3e00395b37
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-05-16 15:42:07 -04:00
23ae24b406
Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().
...
Remove buggy Xml2ToSOG().
2012-05-16 00:10:42 +01:00
e644e34545
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-15 23:47:42 +01:00
1b5ce8c10e
Fix issue where loading OARs could sometimes result in link numbers being reordered.
...
This was because the parts in scene objects were sometimes not serialized in link order.
This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this
had not been done in the SerialiserModule methods that OAR loading used.
Add regression test for same.
Addresses http://opensimulator.org/mantis/view.php?id=5948 , http://opensimulator.org/mantis/view.php?id=5749
2012-05-15 23:43:59 +01:00
02f3b116c6
Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used.
...
Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
2012-05-15 23:42:49 +01:00
Justin Clark-Casey (justincc)