0ad8046582
Resolve a merge issue
2010-02-08 22:44:17 +00:00
ad38450f9c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-08 22:43:53 +00:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
def8f8166a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-08 21:42:23 +00:00
5ddd995de8
Bug fix in configger
2010-02-08 21:42:12 +00:00
aba5908860
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-08 21:39:46 +00:00
ad28db3669
add some method doc to IDynamicTextureManager
2010-02-08 21:21:21 +00:00
59851ceee6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-08 14:29:06 -05:00
9f4883d146
refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObject since this wraps a check that is much less clear
2010-02-08 19:10:54 +00:00
00947cf2ca
Add EventManager.OnIncomingSceneObject event which is triggered by an incoming scene object
...
Add a read-only Attachments property to ScenePresence
2010-02-08 19:02:20 +00:00
70a0d7aa46
Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched
...
in place of OpenSim, dump the config to stdout. Use -f xml, -f ini or -f mysql
to get a condensed ini file, an xml file suitable for webloading, or a set
of mysql insert statements.
2010-02-08 15:21:35 +00:00
5dc278b0d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-performance
2010-02-06 01:05:58 -08:00
fabf10f1cf
endline fix 2
2010-02-06 00:38:22 -05:00
59f6606ecf
Endline fix
2010-02-06 00:37:07 -05:00
e1b5c61247
Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way.
2010-02-05 18:07:59 -08:00
5f1f5c29e9
Fixing an incorrect logging message in insertUserRow
2010-02-05 18:06:01 -08:00
3e697ad57e
* Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
2010-02-05 18:05:57 -08:00
4a092b5ab8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-06 01:13:01 +00:00
6392cfcd61
Fixing an incorrect logging message in insertUserRow
2010-02-06 01:12:45 +00:00
97eaae9d84
* Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
2010-02-06 01:12:36 +00:00
bf9fc69d01
minor: log what kind of wearable cannot be found
2010-02-05 19:34:25 +00:00
68bb2dac45
Revert "Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)"
...
This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules)
This reverts commit 7058a4c259
2010-02-05 19:21:27 +00:00
7058a4c259
Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)
...
If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example)
Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects
2010-02-05 18:09:27 +00:00
044979066c
Fix two inconsistencies with LightShare
2010-02-05 00:53:32 +01:00
0a084a31e9
refactor: chain two ScenePresence constructors together to eliminate common code. No functional changes
2010-02-04 23:23:07 +00:00
16467f6654
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-04 22:22:18 +00:00
f1b99c4a7f
minor: one method doc
2010-02-04 21:35:56 +00:00
8556a9f1a8
Applying patch #4534 by Misterblue to fix ODE physics stickiness
2010-02-04 13:31:06 -08:00
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
2953bee1f4
Revert "change position of OnAttach event firing so that this also happens when a user teleports into a region"
...
The behavior introduced here is not compatible with SL
This reverts commit b6bee4999c
2010-02-04 17:11:06 +00:00
ae9362636e
Line endings cleanup
2010-02-04 17:00:16 +00:00
b9c3846e81
minor: remove some mono compiler warnings
2010-02-03 22:19:28 +00:00
b1dfcccc9a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-03 22:14:58 +00:00
48134af616
Motor angular decay fix.
2010-02-03 16:20:13 -05:00
bde7f361fa
minor: remove one mono compiler warning
2010-02-03 19:46:33 +00:00
7c69badd3d
minor: remove one mono compiler warning
2010-02-03 19:34:08 +00:00
fc1ac25935
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-03 14:32:29 -05:00
2c7672a2b9
minor: add a smidgen of EventManager doc
2010-02-03 19:27:44 +00:00
1442ab08aa
minor: remove one mono compiler warning
2010-02-03 19:08:02 +00:00
cd4651041e
For each delegate added to events in the EventManager, catch and log but do not propogate any exceptions that come back
...
This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
2010-02-03 19:04:31 +00:00
daa66c4811
add an IsRoot property to sop
2010-02-03 16:40:21 +00:00
c020fed1b8
minor: comment out a log line in ScenePresence
2010-02-03 15:46:24 +00:00
da62344822
minor: remove a couple of mono warnings
2010-02-03 15:40:59 +00:00
b6bee4999c
change position of OnAttach event firing so that this also happens when a user teleports into a region
2010-02-03 15:35:41 +00:00
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
88d0fc3b09
allow terrain collision events after regular collision check
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
bbd41de6d5
refactor: move world comm message queueing into its own method
2010-02-02 20:38:58 +00:00
0faeaf98a6
minor: copy some method doc from the WorldComm implementation to the interface
2010-02-02 19:42:45 +00:00
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
Melanie