Dan Lake
396ea3ba65
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-03-29 14:58:23 -07:00
Diva Canto
309eb712a3
Improvement over 2 commits ago: make the hyperlink check understand port 80.
2011-03-28 19:34:55 -07: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
Marck
5a61c76455
The actual change to README.txt about running on Linux.
2011-03-28 13:35:31 +02:00
Marck
dd72a69ea5
More touchup for SQLite.
...
Apply the same change to both the 32-bit and 64-bit DLL target paths. This makes the previous addition to the instructions in the README for running on Linux unnecessary.
2011-03-28 13:13:21 +02:00
BlueWall
fe6900b305
Touchup for SQLite
2011-03-27 19:38:40 -04:00
Melanie
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
Justin Clark-Casey (justincc)
435d72f106
Add SignpostMarv to contributors
2011-03-26 02:46:00 +00:00
Justin Clark-Casey (justincc)
797128a6ad
Rename some member fields to standard m_ OpenSim code convention
2011-03-26 02:44:46 +00:00
Justin Clark-Casey (justincc)
83f48c26d6
add header file
2011-03-26 02:43:41 +00:00
Justin Clark-Casey (justincc)
de0730a54c
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
2011-03-26 02:42:50 +00:00
SignpostMarv Martin
361b3e7ab8
Removing hard-coded plugin loading in favour of direct class instantiation
2011-03-26 02:39:30 +00:00
SignpostMarv Martin
3f4be42a87
Altering log feedback
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
e93531e124
Fixing bug that occurs when using web login- the result was not checked
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
3bc859a834
Making combined auth service re-use the existing auth services instead of duplicating code
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
0e808950fb
InfoFormat > DebugFormat
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
6153c45973
LLLoginHandlers now supports both password & web login
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
af3956348f
Adding a combined auth service, allowing users to login with either web login or password
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
SignpostMarv Martin
482686daab
WebkeyAuthenticationService is now no longer a stub!
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
Justin Clark-Casey (justincc)
f2d2470c25
When an object is duplicated, add it to the full/local id SOG indexes as well as Entities
2011-03-26 02:24:32 +00:00
Justin Clark-Casey (justincc)
26d16567e1
Make SceneGraph.ForEachSOG() execute once for each SOG, not once for each 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
2011-03-26 00:53:19 +00:00
Justin Clark-Casey (justincc)
f30bf429c2
refactor: rename SOG collections in SceneGraph to make it clearer that they are indexing each part's UUID, not just the root part.
2011-03-26 00:42:48 +00:00
Justin Clark-Casey (justincc)
d8e1c380e6
minor: make it clearer in the log where we're loading region config files and not the regions themselves
2011-03-25 23:36:58 +00:00
Justin Clark-Casey (justincc)
3a55d59b45
in region web loader, print out url that config is being loaded from (this wasn't being done anywhere).
2011-03-25 23:29:06 +00:00
Justin Clark-Casey (justincc)
ea72745d43
Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
...
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +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)
d5c7ae5c6b
refactor common sop setup parts into a single method
2011-03-23 22:40:23 +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
Marck
9c979dd0fc
Fix a typo in the SQLite DLL config and amend the instructions for running on Linux.
...
Under Linux (and probably also under OSX), the operating system must be able to find the new SQLite DLL in the library search path.
2011-03-23 08:35:39 +01:00
Justin Clark-Casey (justincc)
b34743e5fe
Add an initial confidence-building TestAddObject() for prim counts.
2011-03-22 23:47:36 +00:00
BlueWall
be878795aa
Typo fix
2011-03-22 17:36:01 -04:00
BlueWall
97d46648cd
More SQLite work.
2011-03-22 16:42:12 -04:00
Justin Clark-Casey (justincc)
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
2011-03-21 23:26:35 +00:00
Justin Clark-Casey (justincc)
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
2011-03-21 23:16:57 +00:00
Justin Clark-Casey (justincc)
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
2011-03-21 22:57:20 +00:00
Justin Clark-Casey (justincc)
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
2011-03-21 22:47:02 +00:00
Justin Clark-Casey (justincc)
2d1f0d224c
minor: slightly adjust previous method doc.
2011-03-21 22:27:16 +00:00
Justin Clark-Casey (justincc)
793bfb5a66
add method doc to IEstateDataService and IEstateDataStore interfaces
2011-03-21 22:25:20 +00:00
Justin Clark-Casey (justincc)
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
Melanie
fb890e543f
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 08:02:56 +00:00