Commit Graph

12123 Commits (82a71fb7e25f89b76985558590bdd263410d7f98)

Author SHA1 Message Date
Diva Canto 35925942fc Deleted unused class that came back because of merge conflicts. 2010-02-08 15:02:50 -08:00
Melanie 6dcc4ab466 Add license header and change branded namespace to generic 2010-02-08 22:50:59 +00:00
Melanie 1d75ad9fd5 Merge branch 'master' into presence-refactor 2010-02-08 21:54:26 +00:00
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
Melanie ef8b2d2f90 Convert null presence data to a singleton as well. Standalone logins now work 2010-02-08 21:38:49 +00:00
Melanie d8bab61af4 Convert NullRegionData to a singleton pattern, since that is required
for a standalone
2010-02-08 21:24:04 +00:00
Justin Clark-Casey (justincc) ad28db3669 add some method doc to IDynamicTextureManager 2010-02-08 21:21:21 +00:00
Melanie 9f5b39300a Add InventoryService to default standalone config 2010-02-08 20:26:47 +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 65a9bcee70 Create root inventory folder with proper type (9) instead of -1 2010-02-08 17:46:54 +00:00
Melanie 210649f0d4 Make an exception report more clear. Fix a database access in Presence to
conform to the changes in the generic table handler.
2010-02-08 17:38:05 +00:00
Melanie b8346e87d8 Bug fix in configger 2010-02-08 16:12:20 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Diva Canto b18e95b3a2 Added missing configs to Standalone.ini 2010-02-08 07:49:14 -08: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
Diva Canto 16f77fa1f1 Finished implementing the XInventory connector. Untested. 2010-02-07 16:41:41 -08:00
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
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
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
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