ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 14:35:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,382 Commits 5 Branches 93 Tags
cd6dce11086a4e8a06257659c19eaa66d3b1a951
Commit Graph

572 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
66a62678e5 get rid of all traces of the now used mock service infrastructure 2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc)
6613daa82a Add a regression test for rezzing a single object into a scene from user inventory 2011-04-13 17:46:36 +01:00
Diva Canto
16c911dcbb Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png. 2011-04-12 19:46:27 -07:00
Justin Clark-Casey (justincc)
8318915d7e Signal prim count taint if the AbsolutePosition of a scene object changes. 
This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules)
Create TestMoveOwnerObject() regression test for this case.
 2011-04-06 20:48:00 +01:00
Justin Clark-Casey (justincc)
63533412f8 Improve previous ILandObject method doc. 
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
 2011-04-06 18:57:50 +01:00
Justin Clark-Casey (justincc)
fa202a05e9 Add method doc to some land bitmap methods in ILandObject. 
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
 2011-04-06 17:19:31 +01:00
Justin Clark-Casey (justincc)
acacee98c6 properly refresh object owner list when refresh button is hit on land parcel object tab 2011-04-05 22:15:06 +01:00
Justin Clark-Casey (justincc)
0e465da187 remove now unused individual LandData prim counts. 
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
 2011-04-05 21:25:54 +01:00
Justin Clark-Casey (justincc)
3d400fc663 If an object is selected, then don't include it in owner/group/others prim counts. 
This fixes the total prim count that the viewer displays when prims are selected - it appears to ignore the total that we pass it and adds up the counts separately.
 2011-04-05 18:24:23 +01:00
Justin Clark-Casey (justincc)
f58941e89f Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns). 
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
 2011-04-05 01:30:13 +01:00
Justin Clark-Casey (justincc)
7bba0177fe If land is not group owned (group ID is always UUID.Zero) then don't check if a prim should be added to the group count 2011-04-02 01:53:47 +01:00
Justin Clark-Casey (justincc)
8e668abc6d add test for removing group owned objects 2011-04-02 01:46:06 +01:00
Justin Clark-Casey (justincc)
01b399055b add test for adding group object, factor out initial zero counts test 2011-04-02 01:37:46 +01:00
Justin Clark-Casey (justincc)
c13502a5cf add remove others object prim count test 2011-04-02 01:15:17 +01:00
Justin Clark-Casey (justincc)
2c86f6ba7d refactor: rename m_dummyUserId to m_otherUserId 2011-04-02 01:13:10 +01:00
Justin Clark-Casey (justincc)
5b0936d4b5 If the land has no group ownership (it is UUID.Zero) then don't put prims in the group count when they are also not group owned. 
Also adds simple test for others owned count when an object is added
 2011-04-02 01:07:52 +01:00
Justin Clark-Casey (justincc)
4d0cffa06e If the prim count gets an object with invalid bounds, don't try to count it. 
This appears to be the more probable explanation for some failures seen.  Either we're counting attachments which are temporarily out of bounds (shouldn't be due to the IsAttachment) check or we're counting scene objects which have out of bounds co-ordinates (seems more likely)
 2011-03-31 23:56:26 +01:00
Justin Clark-Casey (justincc)
efd0c003a3 Put in temporary logging message to find out if scene objects are requesting land objects for co-ordinates outside the region 2011-03-31 22:47:18 +01:00
Justin Clark-Casey (justincc)
f7ed7fc05d When a new parcel is created, make sure the prim counts are updated. 
This is done by tainting the counts where appropriate
 2011-03-30 00:42:02 +01:00
Justin Clark-Casey (justincc)
8b16f7d976 (re)implement selected prim count. 
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
 2011-03-30 00:13:07 +01:00
Justin Clark-Casey (justincc)
f754dedbef Merge branch 'primcounts' 2011-03-29 23:08:44 +01:00
Justin Clark-Casey (justincc)
fe258753a0 disable prim count debug logging temporarily 2011-03-29 23:07:01 +01:00
Diva Canto
d3771e5366 Added code to load a terrain tile of tiff/jpg format. Previously it only worked for one single region. 2011-03-28 16:48:12 -07:00
Diva Canto
2d209d3844 Fix mantis #5413. WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples. 2011-03-28 16:46:04 -07:00
Justin Clark-Casey (justincc)
541cd3e8c8 move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView 
need to move selected prim counts from LandData/LMM still
 2011-03-26 02:19:28 +00:00
Justin Clark-Casey (justincc)
bfd9cc44b4 When an object is duplicated, add the dupe to the uuid/local id indexes as well as the basic entities list. 
Added a prim counts test to reinforce this - shift-copy was no incrementing prim count.  This will sometime become a basic scene test.
New code needs to be refactored so we just call SceneGraph.AddSceneObject().  This will happen in the near future.
With this, basic owner prim counts on a single parcel appear to be working fine (with the same previous existing taint calls as used by the land management module).
More work to do.
 2011-03-26 02:05:53 +00:00
Justin Clark-Casey (justincc)
cc8897fceb Add test for PCM taint. This currently fails due to unexpected behaviour of SceneGraph.ForEachSOG(). This will be corrected soon. 
Also adds lots of temproarily debug logging
 2011-03-26 00:34:49 +00:00
Justin Clark-Casey (justincc)
6ae04448f7 Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule. 
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
 2011-03-25 23:05:51 +00:00
Justin Clark-Casey (justincc)
7f5019b0f2 Add ILandObject.IPrimCounts for the new prim count module. 
Not functional yet, but tests now act against this object rather than interrogating the module directly
 2011-03-25 21:47:54 +00:00
Justin Clark-Casey (justincc)
eaa37d15f2 factor out common test setup code in PCM tests 2011-03-23 23:28:23 +00:00
Justin Clark-Casey (justincc)
f001aab8aa extend TestAddOwnerObject() to add a second object 2011-03-23 23:19:15 +00:00
Justin Clark-Casey (justincc)
ebbe3afaf1 Add PrimCountModuleTests.TestRemoveOwnerObject(). 
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
 2011-03-23 23:14:55 +00:00
Justin Clark-Casey (justincc)
de88227bc4 refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject() 2011-03-23 22:29:27 +00:00
Justin Clark-Casey (justincc)
88673c86a4 use a 3 part object for the pcm test rather than a 1 part, for improved test coverage 2011-03-23 22:17:47 +00:00
Justin Clark-Casey (justincc)
f1f4985ab6 user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero 2011-03-23 22:14:04 +00:00
Justin Clark-Casey (justincc)
654aa7abeb Extend simple PCM add object test to check all counts 2011-03-23 22:12:20 +00:00
Justin Clark-Casey (justincc)
08c3cd6b36 Add method doc to the Get*() methods on PrimCountModule 2011-03-23 22:04:14 +00:00
Justin Clark-Casey (justincc)
67cafbd33a remove a rogue Console.WriteLine() from the last commit. 2011-03-23 21:54:02 +00:00
Justin Clark-Casey (justincc)
d011896341 Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to listen for that rather than EventManager.OnParcelPrimCountAdd 
OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count.
Extend automated test for this scenario.
 2011-03-23 21:53:14 +00:00
Justin Clark-Casey (justincc)
b34743e5fe Add an initial confidence-building TestAddObject() for prim counts. 2011-03-22 23:47:36 +00:00
BlueWall
a3651eb5d0 Thanks Kevin Cozens for a patch that: 
Fixes several spelling mistakes
 2011-03-17 05:48:42 -04:00
Justin Clark-Casey (justincc)
9885f68f44 When setting media on a prim values, use generic object permissions instead of media permissions. 
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate.  It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
 2011-03-14 22:47:14 +00:00
Mic Bowman
836ab6b0e8 Change how map blocks are encoded to make map search 
work with viewer 2.
 2011-03-10 15:23:46 -08:00
Justin Clark-Casey (justincc)
9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. 
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
 2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc)
9b345ebf73 factor out SetPartMediaFlags() function in MoapModule. 2011-03-05 02:42:47 +00:00
Justin Clark-Casey (justincc)
9e579a7891 Fold ClearMediaEntry() back into SetMediaEntry() 2011-03-05 02:21:53 +00:00
Justin Clark-Casey (justincc)
9f85ee29ac Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false 
Implement test for ClearMediaEntry()
 2011-03-05 02:18:03 +00:00
Justin Clark-Casey (justincc)
72cb498fd0 minor: Make MoapModule namespace consistent with other modules 2011-03-05 01:13:59 +00:00
Justin Clark-Casey (justincc)
481ca910da add test for MoapModule.SetMediaUrl() 2011-03-05 01:07:05 +00:00
Justin Clark-Casey (justincc)
3c89527b22 Fix bug where llSetPrimMediaParams() reported success but never set the media texture. 
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script.  This was being done when the viewer was setting them directly.
 2011-03-05 00:06:51 +00:00