Melanie
2ad2561ed1
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2010-02-07 12:06:21 +00:00
Melanie
c6adbccc27
Finish the "Get friends" method
2010-02-07 12:06:00 +00:00
Diva Canto
29e501d688
A little more beef on the xinventory in connector.
2010-02-06 19:06:08 -08: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
John Hurliman
e251f42443
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-05 17:46:37 -08:00
OpenSim Master
310e14cf03
Fixing an incorrect logging message in insertUserRow
2010-02-05 17:45:36 -08:00
OpenSim Master
e982397cde
* 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 17:45:31 -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
Melanie
1b44711ceb
Clarify some names
2010-02-05 13:11:33 +00:00
Melanie
b92cb6126d
Implement the friends data adaptor
2010-02-05 12:31:29 +00:00
CasperW
044979066c
Fix two inconsistencies with LightShare
2010-02-05 00:53:32 +01: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
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00: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
Melanie
ae9362636e
Line endings cleanup
2010-02-04 17:00:16 +00:00
Melanie
0ab8dd61d7
Finally cutting the gordian knot. Friends needs to be both a module and a
...
service, and never the twain shall meet. This finally opens up the path to
a working friends implementation
2010-02-04 12:21:14 +00:00
Melanie
f9a61f2825
Some interface and data structure changes, add the missing method in friends
2010-02-04 10:51:36 +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
Kitto Flora
48134af616
Motor angular decay fix.
2010-02-03 16:20:13 -05: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
Kitto Flora
fc1ac25935
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-03 14:32:29 -05: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
Diva Canto
11ed5dee3b
Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for now until I understand better the client IP issue.
2010-02-02 19:41:46 -08:00
Diva Canto
b517eb6d3a
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-02-02 16:55:32 -08:00
Diva Canto
df3ab04e0c
Removed useless config.
2010-02-02 16:54:55 -08:00
Diva Canto
80bb540702
Removed useless config.
2010-02-02 16:28:41 -08:00
Melanie
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +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