Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix llGetSimulatorHostname to return configured hostname | BlueWall | 2012-05-23 | 3 | -1/+7 | |
| | ||||||
* | minor: Change [OBJECT COMMANDS MODULE] log strings to [REGION COMMANDS ↵ | Justin Clark-Casey (justincc) | 2012-05-23 | 1 | -6/+6 | |
| | | | | MODULE] strings, though all these are currently commented out anyway | |||||
* | Add "show scene" command which lists stats for the currently selected ↵ | Justin Clark-Casey (justincc) | 2012-05-23 | 2 | -1/+161 | |
| | | | | | | | | | | 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.) | |||||
* | refactor: Rename ConsoleTableRow and ConsoleTableColumn to ↵ | Justin Clark-Casey (justincc) | 2012-05-23 | 2 | -15/+15 | |
| | | | | ConsoleDisplayTableRow and ConsoleDisplayTableColumn | |||||
* | Add ConsoleDisplayList for more consistent formatting of console output in ↵ | Justin Clark-Casey (justincc) | 2012-05-23 | 2 | -9/+121 | |
| | | | | | | list form. Convert "show region" to use this structure rather than hand-constructing | |||||
* | refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity | Justin Clark-Casey (justincc) | 2012-05-23 | 2 | -3/+3 | |
| | ||||||
* | Add missing Y co-ord in "show region" console command information | Justin Clark-Casey (justincc) | 2012-05-23 | 1 | -1/+1 | |
| | ||||||
* | Lay out "show region" information in an easier to read line by line format | Justin Clark-Casey (justincc) | 2012-05-23 | 1 | -9/+11 | |
| | ||||||
* | Fetch the dialog module reference in AttachmentsModule in RegionLoaded() not ↵ | Justin Clark-Casey (justincc) | 2012-05-23 | 1 | -1/+1 | |
| | | | | | | 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. | |||||
* | minor: Make log class names in InventoryAccessModule uniform | Justin Clark-Casey (justincc) | 2012-05-23 | 1 | -10/+10 | |
| | ||||||
* | Fix bug where an avatar that had an object they owned attached through ↵ | Justin Clark-Casey (justincc) | 2012-05-23 | 8 | -169/+155 | |
| | | | | | | | 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. | |||||
* | Setting 'in transit' on a local teleport as well as inter-region teleports. | Justin Clark-Casey (justincc) | 2012-05-21 | 1 | -0/+9 | |
| | | | | | 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. | |||||
* | minor: extend commented out LinkInventoryItem log message for future use | Justin Clark-Casey (justincc) | 2012-05-21 | 2 | -8/+8 | |
| | ||||||
* | Fix bug where outfit folders could not be renamed. | Justin Clark-Casey (justincc) | 2012-05-21 | 1 | -4/+13 | |
| | | | | Outfit folders are a type of system folder whose details are allowed to change. | |||||
* | Improve locking of RegionCombinerModule.m_regions | Justin Clark-Casey (justincc) | 2012-05-19 | 1 | -24/+29 | |
| | ||||||
* | Add size of region to OAR control file. Megaregions (sw root OARs when ↵ | Justin Clark-Casey (justincc) | 2012-05-19 | 3 | -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-19 | 2 | -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-19 | 1 | -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-19 | 1 | -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-19 | 1 | -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. | |||||
* | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ↵ | Justin Clark-Casey (justincc) | 2012-05-19 | 3 | -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-19 | 1 | -10/+29 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-19 | 2 | -8/+6 | |
|\ | ||||||
| * | Further refinement on properties | BlueWall | 2012-05-18 | 1 | -7/+4 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-05-18 | 2 | -8/+13 | |
| |\ | ||||||
| * | | Cleanup + change properties to set fields with private set : Thanks Justin ↵ | BlueWall | 2012-05-18 | 2 | -3/+4 | |
| | | | | | | | | | | | | for the tip. | |||||
* | | | Add is_megaregion flag into oar control file. Not currently read - for ↵ | Justin Clark-Casey (justincc) | 2012-05-19 | 4 | -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-19 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2012-05-18 | 3 | -1/+14 | |
|\ \ | |/ | ||||||
| * | Provide Telehub setting to allow use of landmarks | BlueWall | 2012-05-18 | 3 | -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-18 | 1 | -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-18 | 1 | -10/+10 | |
| | ||||||
* | Add millisecond logging to pCampBot for debugging purposes | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -1/+1 | |
| | ||||||
* | Add level 2 debug eq logging which logs event queue polls. | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -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-18 | 1 | -0/+3 | |
| | | | | logging | |||||
* | refactor: move EventQueueGet path generation into common method. Rename ↵ | Justin Clark-Casey (justincc) | 2012-05-18 | 2 | -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-17 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2012-05-17 | 2 | -31/+30 | |
|\ | ||||||
| * | Merge branch 'master' of /home/opensim/lib/osgrid/opensim | BlueWall | 2012-05-17 | 1 | -29/+28 | |
| |\ | ||||||
| | * | Force the default Telehub router if no matches are found in the config. | BlueWall | 2012-05-17 | 1 | -29/+28 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-05-16 | 1 | -0/+67 | |
| |\ \ | ||||||
| * | | | Fix boo-boo in OpenSim.ini.example affecting telehub sequential routing | BlueWall | 2012-05-16 | 1 | -2/+2 | |
| | |/ | |/| | | | | | | | Configuration value should be "sequence" instead of "sequential" | |||||
* | | | Check agent limit against root agent count rather than both root and child ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 3 | -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. | |||||
* | | minor: improve method doc for ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -1/+1 | |
| | | | | | | | | TestSameSimulatorSeparatedRegionsCreateAgentFails() | |||||
* | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails() | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -0/+67 | |
|/ | ||||||
* | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 2 | -2/+8 | |
| | | | | test logging accidentally left in | |||||
* | minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -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-17 | 2 | -1/+77 | |
| | ||||||
* | Remove redundant "Teleport failed:" from reason when QueryAccess fails for ↵ | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -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. | |||||
* | Route OAR SOG loading through the common ↵ | Justin Clark-Casey (justincc) | 2012-05-16 | 3 | -115/+5 | |
| | | | | | | SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG(). Remove buggy Xml2ToSOG(). |