Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'primcounts' | Justin Clark-Casey (justincc) | 2011-03-29 | 18 | -59/+271 |
|\ | |||||
| * | disable prim count debug logging temporarily | Justin Clark-Casey (justincc) | 2011-03-29 | 2 | -34/+36 |
| | | |||||
| * | add save of LLClientView I forgot from last commit | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -4/+2 |
| | | |||||
| * | move total parcel prim calculations into IPrimCounts instead of doing this ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 3 | -1/+70 |
| | | | | | | | | | | | | in LLClientView need to move selected prim counts from LandData/LMM still | ||||
| * | When an object is duplicated, add the dupe to the uuid/local id indexes as ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 2 | -1/+52 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Merge branch 'master' into primcounts | Justin Clark-Casey (justincc) | 2011-03-26 | 4 | -49/+83 |
| |\ | |||||
| * | | Add test for PCM taint. This currently fails due to unexpected behaviour of ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 4 | -16/+201 |
| | | | | | | | | | | | | | | | | | | SceneGraph.ForEachSOG(). This will be corrected soon. Also adds lots of temproarily debug logging | ||||
| * | | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 16 | -154/+89 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Improvement over 2 commits ago: make the hyperlink check understand port 80. | Diva Canto | 2011-03-28 | 1 | -4/+29 |
| | | | |||||
* | | | Added code to load a terrain tile of tiff/jpg format. Previously it only ↵ | Diva Canto | 2011-03-28 | 1 | -2/+13 |
| | | | | | | | | | | | | worked for one single region. | ||||
* | | | Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵ | Diva Canto | 2011-03-28 | 2 | -1/+15 |
| | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-03-27 | 23 | -137/+928 |
|\ \ \ | |||||
| * | | | Rename some member fields to standard m_ OpenSim code convention | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -8/+8 |
| | | | | |||||
| * | | | add header file | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+28 |
| | | | | |||||
| * | | | Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure. | ||||
| * | | | Removing hard-coded plugin loading in favour of direct class instantiation | SignpostMarv Martin | 2011-03-26 | 1 | -6/+5 |
| | | | | |||||
| * | | | Altering log feedback | SignpostMarv Martin | 2011-03-26 | 2 | -14/+17 |
| | | | | |||||
| * | | | Fixing bug that occurs when using web login- the result was not checked | SignpostMarv Martin | 2011-03-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Making combined auth service re-use the existing auth services instead of ↵ | SignpostMarv Martin | 2011-03-26 | 1 | -21/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | duplicating code Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | | | InfoFormat > DebugFormat | SignpostMarv Martin | 2011-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | | | LLLoginHandlers now supports both password & web login | SignpostMarv Martin | 2011-03-26 | 1 | -4/+15 |
| | | | | | | | | | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | | | Adding a combined auth service, allowing users to login with either web ↵ | SignpostMarv Martin | 2011-03-26 | 1 | -0/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | login or password Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | | | WebkeyAuthenticationService is now no longer a stub! | SignpostMarv Martin | 2011-03-26 | 1 | -5/+35 |
| | | | | | | | | | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
| * | | | When an object is duplicated, add it to the full/local id SOG indexes as ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+29 |
| | |/ | |/| | | | | | | | well as Entities | ||||
| * | | Make SceneGraph.ForEachSOG() execute once for each SOG, not once for each ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -5/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | prim (e.g. a SOG with 3 prims would have the action executed three times). To do this, a new SceneObjectGroupsByFullID index in SceneGraph which just index's prims by their root part UUID, in order to avoid the inefficiency of filtering existing lists. Existing callers to SceneGraph.ForEachSOG() did not fail due to the multiple per SOG action executions - they were probably just much less efficient. Code suggests that no callers expected ForEachSOG() to execute actions on sog multiple times | ||||
| * | | refactor: rename SOG collections in SceneGraph to make it clearer that they ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -30/+30 |
| | | | | | | | | | | | | are indexing each part's UUID, not just the root part. | ||||
| * | | minor: make it clearer in the log where we're loading region config files ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 2 | -17/+15 |
| | | | | | | | | | | | | and not the regions themselves | ||||
| * | | in region web loader, print out url that config is being loaded from (this ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -2/+2 |
| | | | | | | | | | | | | wasn't being done anywhere). | ||||
| * | | Log the xml/ini regions config files that opensim loads from, and the ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -4/+20 |
| |/ | | | | | | | | | | | regions that it loaded from them This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc. | ||||
| * | Add ILandObject.IPrimCounts for the new prim count module. | Justin Clark-Casey (justincc) | 2011-03-25 | 5 | -31/+52 |
| | | | | | | | | Not functional yet, but tests now act against this object rather than interrogating the module directly | ||||
| * | factor out common test setup code in PCM tests | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -57/+53 |
| | | |||||
| * | extend TestAddOwnerObject() to add a second object | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -4/+14 |
| | | |||||
| * | Add PrimCountModuleTests.TestRemoveOwnerObject(). | Justin Clark-Casey (justincc) | 2011-03-23 | 2 | -6/+60 |
| | | | | | | | | Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs | ||||
| * | refactor common sop setup parts into a single method | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -17/+23 |
| | | |||||
| * | refactor: simplify part of AddSceneObject() test setup by moving sog ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 2 | -10/+33 |
| | | | | | | | | construction into SceneSetupHelpers.CreateSceneObject() | ||||
| * | use a 3 part object for the pcm test rather than a 1 part, for improved test ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -10/+14 |
| | | | | | | | | coverage | ||||
| * | user a non UUID.Zero user in pcm test to avoid any special treatment of ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -4/+5 |
| | | | | | | | | UUID.Zero | ||||
| * | Extend simple PCM add object test to check all counts | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -0/+11 |
| | | |||||
| * | Add method doc to the Get*() methods on PrimCountModule | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -0/+27 |
| | | |||||
| * | remove a rogue Console.WriteLine() from the last commit. | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -1/+0 |
| | | |||||
| * | Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 5 | -5/+59 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Add an initial confidence-building TestAddObject() for prim counts. | Justin Clark-Casey (justincc) | 2011-03-22 | 4 | -25/+115 |
| | | |||||
| * | On initial setup, include estate and regions names in questions to make it ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 2 | -5/+7 |
| | | | | | | | | clearer what they relate to. | ||||
| * | In initial setup, stop a user being able to create a new estate with the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -14/+31 |
| | | | | | | | | same name as an existing estate. | ||||
| * | On initial opensim setup, don't ask the user whether they want to join an ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -39/+63 |
| | | | | | | | | existing opensim estate when there aren't any. Proceed directly to estate setup instead. | ||||
| * | refactor: use EstateDataService property directly instead of loading it into ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -12/+7 |
| | | | | | | | | a local variable | ||||
| * | minor: slightly adjust previous method doc. | Justin Clark-Casey (justincc) | 2011-03-21 | 2 | -2/+2 |
| | | |||||
| * | add method doc to IEstateDataService and IEstateDataStore interfaces | Justin Clark-Casey (justincc) | 2011-03-21 | 2 | -2/+90 |
| | | |||||
| * | On initial region registration, if the user chooses the option to make the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 8 | -1/+172 |
| | | | | | | | | region part of an existing estate, then list the existing region names. | ||||
* | | Don't send a windlight profile to clients if windlight is not set for | Melanie | 2011-03-21 | 1 | -2/+2 |
|/ | | | | | that region. This should restore normal day and night cycles for regions without WL settings. |