Melanie
def8f8166a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-08 21:42:23 +00:00
Melanie
5ddd995de8
Bug fix in configger
2010-02-08 21:42:12 +00:00
Justin Clark-Casey (justincc)
aba5908860
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-08 21:39:46 +00:00
Justin Clark-Casey (justincc)
ad28db3669
add some method doc to IDynamicTextureManager
2010-02-08 21:21:21 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
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
John Hurliman
5dc278b0d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-performance
2010-02-06 01:05:58 -08:00
Teravus Ovares (Dan Olivares)
fabf10f1cf
endline fix 2
2010-02-06 00:38:22 -05:00
Teravus Ovares (Dan Olivares)
59f6606ecf
Endline fix
2010-02-06 00:37:07 -05:00
Master ScienceSim
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
OpenSim Master
5f1f5c29e9
Fixing an incorrect logging message in insertUserRow
2010-02-05 18:06:01 -08:00
OpenSim Master
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
Melanie
4a092b5ab8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-06 01:13:01 +00:00
OpenSim Master
6392cfcd61
Fixing an incorrect logging message in insertUserRow
2010-02-06 01:12:45 +00:00
OpenSim Master
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
Justin Clark-Casey (justincc)
bf9fc69d01
minor: log what kind of wearable cannot be found
2010-02-05 19:34:25 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
0a084a31e9
refactor: chain two ScenePresence constructors together to eliminate common code. No functional changes
2010-02-04 23:23:07 +00:00
Justin Clark-Casey (justincc)
16467f6654
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-04 22:22:18 +00:00
Justin Clark-Casey (justincc)
f1b99c4a7f
minor: one method doc
2010-02-04 21:35:56 +00:00
John Hurliman
8556a9f1a8
Applying patch #4534 by Misterblue to fix ODE physics stickiness
2010-02-04 13:31:06 -08:00
Melanie
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
Justin Clark-Casey (justincc)
b9c3846e81
minor: remove some mono compiler warnings
2010-02-03 22:19:28 +00:00
Justin Clark-Casey (justincc)
b1dfcccc9a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-03 22:14:58 +00:00
Justin Clark-Casey (justincc)
bde7f361fa
minor: remove one mono compiler warning
2010-02-03 19:46:33 +00:00
Justin Clark-Casey (justincc)
7c69badd3d
minor: remove one mono compiler warning
2010-02-03 19:34:08 +00:00
Justin Clark-Casey (justincc)
2c7672a2b9
minor: add a smidgen of EventManager doc
2010-02-03 19:27:44 +00:00
Justin Clark-Casey (justincc)
1442ab08aa
minor: remove one mono compiler warning
2010-02-03 19:08:02 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
daa66c4811
add an IsRoot property to sop
2010-02-03 16:40:21 +00:00
Justin Clark-Casey (justincc)
c020fed1b8
minor: comment out a log line in ScenePresence
2010-02-03 15:46:24 +00:00
Justin Clark-Casey (justincc)
da62344822
minor: remove a couple of mono warnings
2010-02-03 15:40:59 +00:00
Justin Clark-Casey (justincc)
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
Melanie
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
radams1
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
Justin Clark-Casey (justincc)
bbd41de6d5
refactor: move world comm message queueing into its own method
2010-02-02 20:38:58 +00:00
Justin Clark-Casey (justincc)
0faeaf98a6
minor: copy some method doc from the WorldComm implementation to the interface
2010-02-02 19:42:45 +00:00
Justin Clark-Casey (justincc)
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
Justin Clark-Casey (justincc)
0e23c5fffb
minor: add some documentation to EventManager.OnObjectGrab
2010-02-02 18:19:15 +00:00
Justin Clark-Casey (justincc)
96d5c8196a
minor: add reminder to lock SOG.Children before using it directly in order to avoid threading issues
2010-02-02 15:45:41 +00:00
Justin Clark-Casey (justincc)
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
Justin Clark-Casey (justincc)
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
Justin Clark-Casey (justincc)
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
Justin Clark-Casey (justincc)
3863cd1d23
Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it
2010-02-01 21:35:05 +00:00
Justin Clark-Casey (justincc)
4c1740f7d8
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-02-01 20:15:36 +00:00
Justin Clark-Casey (justincc)
53a01dc422
Don't try to start attachment scripts or send updates if the attachment itself has been unsuccessful
2010-02-01 20:06:43 +00:00
Justin Clark-Casey (justincc)
4c1365f149
apply http://opensimulator.org/mantis/view.php?id=4486
...
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
2010-01-30 00:15:37 +00:00
Justin Clark-Casey (justincc)
627df50646
Apply http://opensimulator.org/mantis/view.php?id=4504
...
Stop the REST console crashing when entering return on an empty line
Thanks BlueWall
2010-01-29 23:38:44 +00:00