571693d7b6
Revert last commit
2010-09-15 08:16:38 -07:00
77eb8ade8c
Don't throw an exception if the authorizationservice is missing a serviceuri config entry. Not every authorization service will need a URI.
2010-09-15 08:08:29 -07:00
1f74f013b2
Don't fart when deserializing a prim with no ParentGroup set yet
2010-09-15 07:59:28 -07:00
0d034712ba
Make AuthorizationService optional and disabled by default. It depends on
...
external PHP and the default configuration makes it throw for not
having a URL to this PHP
2010-09-15 15:56:03 +01:00
3275fbec54
Fix the above
2010-09-14 23:06:44 +01:00
7f7bbbb84a
Fix the above
2010-09-14 23:05:42 +01:00
18beb796bc
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:50:38 +01:00
585e575d23
Allow to place the connection strings and providers for estate and region
...
in their oqn sections, for those of us who don't want a catch-all
DatabaseService section.
2010-09-14 22:47:45 +01:00
8ed08a10d9
Remove long unused Region/Framework/ThreadTracker
...
All methods had already been deleted, only GetThreads() was left
2010-09-14 22:34:55 +01:00
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
540a1912ce
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-14 22:14:23 +02:00
356b1ef1d9
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:16:02 +01:00
e27f59cf42
reorder some code to avoid merge issues in the future
2010-09-14 22:15:16 +01:00
2f41bc4ca7
Fix merge issues
2010-09-14 22:14:08 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
cc290abf7a
Adjust the code for ghost prim removal to new information from Kitto
2010-09-14 22:13:44 +02:00
d299f8b55c
Fix a small left over buglet and also add checking of the physics actor
...
position on backup. This way, ant object that has been moved will be
checked for ghost prims as soon as it is persisted.
2010-09-14 19:41:53 +02:00
095d400f5b
fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSimDefaults.ini is present
...
this should allow the testsuite to run again and the autobuild to complete
2010-09-14 17:01:53 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
95702129c7
Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does the work of deciding what users commonly change and what they don't"
...
This reverts commit fc48eb7b54
2010-09-14 03:07:41 +01:00
ec305a4825
LSL compatibility: Don't throw an exception if an invalid key is passed to llInstantMessage, instead shout about it and apply the usual delay. This now matches SL.
2010-09-13 17:43:45 -07:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
fc48eb7b54
Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does the work of deciding what users commonly change and what they don't
2010-09-14 01:30:12 +01:00
51411d5664
add the missing ini example
2010-09-14 00:32:49 +01:00
1654e27cda
Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini
2010-09-13 16:23:22 -07:00
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
36f81c66e5
Comment out SOG storing debug log message
...
This can get very spammy with regularly changing objects. Please uncomment if required.
2010-09-14 00:05:38 +01:00
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
4aadfc3007
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:27:56 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
656e64b3ed
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:22:25 +01:00
8e51ca3a7b
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:17:42 +01:00
5e1aab92f5
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:12:48 +01:00
dd803b4f0c
minor: Add comments which explain what's going on wrt avatar movements at various points in the main scene loop and associated methods
2010-09-13 21:53:25 +01:00
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
2ed276eb47
Adding missing ConnectionString lines to [DatabaseService] sections for SQLite configs
2010-09-13 11:39:58 -07:00
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
meta7