aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-05-194-176/+243
|\ \ \ | |/ /
| * | Improve locking of RegionCombinerModule.m_regionsJustin Clark-Casey (justincc)2012-05-191-24/+29
| | |
| * | Add size of region to OAR control file. Megaregions (sw root OARs when ↵Justin Clark-Casey (justincc)2012-05-193-17/+56
| | | | | | | | | | | | | | | | | | saved) will have a size larger than 256x256 Not yet read. Do not rely on this information yet, it may change.
| * | refactor: Add RegionConnection.PosX and PosY to return position in meters ↵Justin Clark-Casey (justincc)2012-05-192-30/+43
| | | | | | | | | | | | rather than copy/pasting the necessary calculations in lots of places.
| * | refactor: Rename connection paramaters from "conn" and "regionConnections" ↵Justin Clark-Casey (justincc)2012-05-191-127/+133
| | | | | | | | | | | | so that it's easy to tell whether they refer to the root region connection or a new region connection
| * | Correct some log messages in RegionCombinerModule about the position of the ↵Justin Clark-Casey (justincc)2012-05-191-5/+3
| | | | | | | | | | | | root region of a megaregion relative to an added region
| * | Make the megaregion total area given to the physics module accurate instead ↵Justin Clark-Casey (justincc)2012-05-191-3/+9
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-05-1915-130/+388
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ↵Justin Clark-Casey (justincc)2012-05-193-20/+5
| | | | | | | | | | | | | | | | | | more than one megaregion in a simulator, separated by water. Rename IsRootRegion() to IsRootForMegaregion()
| * | Add some method doc to RegionCombinerModule. Clean up log messages.Justin Clark-Casey (justincc)2012-05-191-10/+29
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-192-8/+6
| |\ \
| | * | Further refinement on propertiesBlueWall2012-05-181-7/+4
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-182-8/+13
| | |\ \
| | * | | Cleanup + change properties to set fields with private set : Thanks Justin ↵BlueWall2012-05-182-3/+4
| | | | | | | | | | | | | | | | | | | | for the tip.
| * | | | Add is_megaregion flag into oar control file. Not currently read - for ↵Justin Clark-Casey (justincc)2012-05-194-43/+145
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This ↵Justin Clark-Casey (justincc)2012-05-191-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-183-1/+14
| |\ \ \ | | |/ /
| | * | Provide Telehub setting to allow use of landmarksBlueWall2012-05-183-1/+14
| | | | | | | | | | | | | | | | Setting to allow use of landmarks to override telehub routing. Default is off.
| * | | Fix issue where a new outfit folder is not created when a new outfit is ↵Justin Clark-Casey (justincc)2012-05-181-3/+9
| |/ / | | | | | | | | | | | | | | | saved if there are no previous outfits This was because AddFolder() was disallowing these though they are legal.
| * | Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| | |
| * | Add millisecond logging to pCampBot for debugging purposesJustin Clark-Casey (justincc)2012-05-181-1/+1
| | |
| * | Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| | | | | | | | | | | | Refactor: eq message logging into common method.
| * | Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte ↵Justin Clark-Casey (justincc)2012-05-181-0/+3
| | | | | | | | | | | | logging
| * | refactor: move EventQueueGet path generation into common method. Rename ↵Justin Clark-Casey (justincc)2012-05-182-21/+34
| | | | | | | | | | | | some local variables in line with code conventions. Add commented out EQG log lines for future use.
| * | Don't eagerly clear frame collision events when physics actors subscribe and ↵Justin Clark-Casey (justincc)2012-05-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-172-31/+30
| |\ \
| * | | Check agent limit against root agent count rather than both root and child ↵Justin Clark-Casey (justincc)2012-05-173-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'avination' into careminsterMelanie2012-05-176-10/+332
|\ \ \ \ | | |_|/ | |/| |
| * | | udp transfer: make number packets estimation coerent with number actually ↵UbitUmarov2012-05-171-2/+8
| | | | | | | | | | | | | | | | sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
| * | | trigger collision sounds on active agent position for better spatial effect ↵UbitUmarov2012-05-172-23/+22
| | | | | | | | | | | | | | | | without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code
| * | | increase avatars collisions report to 10 per sec, Stopped sound on avatar to ↵UbitUmarov2012-05-172-2/+2
| | | | | | | | | | | | | | | | volumedetect collision
| * | | add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-172-62/+120
| | | |
| * | | default colisionVolume is 0, use it only for user specified soundUbitUmarov2012-05-171-3/+6
| | | |
| * | | default collision sounds. Incomplete, untested, needs revisionUbitUmarov2012-05-172-1/+205
| | | |
| * | | collision sounds: simplify send code a bit and limit sending rate to 5 per ↵UbitUmarov2012-05-161-1/+36
| | | | | | | | | | | | | | | | sec per part ???
| * | | Added a invalidCollisionSoundUUID so that scripts can stop all collision ↵UbitUmarov2012-05-163-6/+23
| | | | | | | | | | | | | | | | sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision.
* | | | Merge branch 'master' into careminsterMelanie2012-05-176-44/+198
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-05-171-29/+28
| |\ \ \
| | * | | Force the default Telehub router if no matches are found in the config.BlueWall2012-05-171-29/+28
| | | | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-161-0/+67
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | minor: improve method doc for ↵Justin Clark-Casey (justincc)2012-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | TestSameSimulatorSeparatedRegionsCreateAgentFails()
| | * | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()Justin Clark-Casey (justincc)2012-05-171-0/+67
| | |/ /
| * | | Fix boo-boo in OpenSim.ini.example affecting telehub sequential routingBlueWall2012-05-161-2/+2
| |/ / | | | | | | | | | Configuration value should be "sequence" instead of "sequential"
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression ↵Justin Clark-Casey (justincc)2012-05-172-2/+8
| | | | | | | | | | | | test logging accidentally left in
| * | minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator ↵Justin Clark-Casey (justincc)2012-05-171-8/+6
| | | | | | | | | | | | | | | | | | 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
| * | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()Justin Clark-Casey (justincc)2012-05-172-1/+77
| | |
| * | Remove redundant "Teleport failed:" from reason when QueryAccess fails for ↵Justin Clark-Casey (justincc)2012-05-171-4/+12
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-05-168-219/+282
|\ \ \ | |/ /
| * | Route OAR SOG loading through the common ↵Justin Clark-Casey (justincc)2012-05-163-115/+5
| | | | | | | | | | | | | | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG().
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-155-523/+202
| |\ \
generated by cgit v1.1 at 2024-12-24 01:51:20 +0000