Justin Clark-Casey (justincc)
d52b2b9ee7
minor: remove some mono compiler warnings
2010-09-16 20:46:24 +01:00
Melanie
f5e3d5a33a
Add the modules include line back that i dropped by mistake
2010-09-15 23:24:58 +01:00
Justin Clark-Casey (justincc)
7383173d3d
extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() to reduce scope for kill/update race conditions
...
This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update
This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged
Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks
However, evidence suggests that there is still a kill/update race somewhere
2010-09-15 23:06:38 +01:00
Justin Clark-Casey (justincc)
e6bc77d832
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-15 23:03:02 +01:00
Justin Clark-Casey (justincc)
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
Justin Clark-Casey (justincc)
16f296f489
Instead of locking SOG.Children when a group is being removed from the scene, iterate over an unlocked list instead
...
Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView
At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on
Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either
2010-09-15 21:51:13 +01:00
Melanie
c1ccfa6d8d
Mark up OpenSim.ini.example for use with an automatic configuration tool.
...
Remove seldom changed options from OpenSim.ini.example.
Remove non-overridable settings like [Architecture] from OpenSimDefaults.ini
2010-09-15 20:29:28 +01:00
Melanie
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
Melanie
3275fbec54
Fix the above
2010-09-14 23:06:44 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
.
Reverted by agreement.
2010-09-14 03:30:07 +01:00
Justin Clark-Casey (justincc)
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
.
Reverted by agreement.
2010-09-14 03:07:41 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
51411d5664
add the missing ini example
2010-09-14 00:32:49 +01:00
John Hurliman
1654e27cda
Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini
2010-09-13 16:23:22 -07:00
Melanie
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
Justin Clark-Casey (justincc)
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
Melanie
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
Melanie
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
Melanie
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
Melanie
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
Melanie
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
Justin Clark-Casey (justincc)
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
Justin Clark-Casey (justincc)
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
Justin Clark-Casey (justincc)
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
John Hurliman
2ed276eb47
Adding missing ConnectionString lines to [DatabaseService] sections for SQLite configs
2010-09-13 11:39:58 -07:00
John Hurliman
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
John Hurliman
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
John Hurliman
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
John Hurliman
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
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
Jeff Ames
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
John Hurliman
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
John Hurliman
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
John Hurliman
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
John Hurliman
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
John Hurliman
47ac9f97b1
Re-enabled asset last access time logging in MySQL
2010-09-11 18:29:38 -07:00
John Hurliman
a9acc6730d
Removing .svn directories under Prebuild/ from source control
2010-09-11 18:26:59 -07:00
Melanie
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
Diva Canto
d5c7a8d28c
All these files want to be committed. All white space junk. grr.
2010-09-10 21:18:23 -07:00
Diva Canto
51a5af93d0
White space junk.
2010-09-10 18:48:32 -07:00