Commit Graph

13511 Commits (4a24bf74d93924b688fcd5246218083108c93c01)

Author SHA1 Message Date
Teravus Ovares (Dan Olivares) 4a24bf74d9 * Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.
* This is libOMV SVN revision 3463.
2010-10-30 02:06:43 -04:00
Melanie adef6b04cb Logins work now, but avatars are green ugly gnomes. 2010-10-30 02:52:59 +01:00
Melanie ba6f651b06 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 02:26:18 +01:00
Justin Clark-Casey (justincc) f9227977f8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-30 03:07:45 +01:00
Justin Clark-Casey (justincc) 45220a6954 minor: remove some old commented out code 2010-10-30 03:01:40 +01:00
Marck 63bdfb1e28 Clarify comment for configuration option Check4096 and show the default value. 2010-10-30 03:01:27 +01:00
Melanie ff7da2082d This commit fixes all the appearance related null refs. Still can't log in,
client displays a blank error box.
2010-10-30 02:25:25 +01:00
Justin Clark-Casey (justincc) 343c894658 Set async_packet_handling = true by default
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
Justin Clark-Casey (justincc) ade71c9ed7 Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info 2010-10-30 01:32:56 +01:00
Melanie 46362cd1c0 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:58 +01:00
Melanie 7503c4ad61 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:42 +01:00
Melanie 818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc) 09705514ff tweak a few more scene presence logging messages for consistency 2010-10-29 23:52:25 +01:00
Justin Clark-Casey (justincc) e66ec432af Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic 2010-10-29 23:45:10 +01:00
Justin Clark-Casey (justincc) abcde41c0d Merge branch 'justincc-dev' 2010-10-29 23:15:35 +01:00
Justin Clark-Casey (justincc) 25e19ba7e9 add timing report to CompleteScenePresence for diagnostic purposes 2010-10-29 23:03:11 +01:00
Justin Clark-Casey (justincc) bcd784b316 for now, comment out some older or redundant log debug lines to make diagnostics easier 2010-10-29 21:49:26 +01:00
Justin Clark-Casey (justincc) f19816aeb9 Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics 2010-10-29 21:38:26 +01:00
Melanie 4f39329d6f Rename the new default texture to be consistent with the others 2010-10-29 21:10:19 +01:00
Melanie 32e5bee3a7 Add a default alpha layer 2010-10-29 21:09:31 +01:00
Melanie 934e536738 Merge commit 'cmickeyb/dev-appearance' 2010-10-29 21:06:46 +01:00
Master ScienceSim 49fa7e91b9 Clean up some cruft from the last commit. Re-add the initial update
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
Master ScienceSim f5c9a56c8b Bunch of fixes that reduce the number of times appearance
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
Melanie 5f4badf9e2 Add my work on top of cmickeyb's 2010-10-29 20:44:29 +01:00
Melanie 05d2302c62 Merge branch 'dev-appearance' 2010-10-29 20:24:14 +01:00
Melanie e6fe83cd93 Revert "Preliminary work on appearance layers. No user functionality yet."
This work conflicts with cmickeyb's more extensive, related work

This reverts commit 9c829c0410.
2010-10-29 20:17:59 +01:00
Melanie 9c829c0410 Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:58:22 +01:00
Marck 7b0d643999 HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
Master ScienceSim 68666efd25 Configuration of persistent baked textures and save/send delays. 2010-10-28 12:00:04 -07:00
Master ScienceSim f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Master ScienceSim 0f28fa400d Added background thread to handle delayed send and save of appearance
to accommodate batching of the many updates that happen on login
and teleport.

Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
Jeff Ames 727838f914 Formatting cleanup. 2010-10-28 00:37:32 -04:00
Melanie 1fcac7203d Prevent nullrefs in scene object deletion. Mantis #5156 2010-10-27 20:47:27 +01:00
dahlia a4e95c0717 Merge branch 'master' of ssh://MyConnection01/var/git/opensim 2010-10-26 21:20:18 -07:00
dahlia 5968d343bb Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications 2010-10-26 21:19:33 -07:00
Jeff Ames a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Master ScienceSim 9cfd3e1d5a Small cleanup and add more debugging information 2010-10-26 12:54:28 -07:00
Master ScienceSim 9132e251aa Made the check for texture assets asynchronous. This is one part of
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
Master ScienceSim 6e58c3d563 Half of the compatibility is working. Login into a new region with
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
Mic Bowman 657cceb884 Intermediate commit for backward compatability; does not compile yet 2010-10-25 09:42:28 -07:00
Latif Khalifa c74c1620a1 * Updated libomv to r3461
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
Melanie 852c61aaa6 Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL 2010-10-24 18:17:21 +01:00
Diva Canto 627d1a42fe Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object. 2010-10-23 20:39:41 -07:00
Justin Clark-Casey (justincc) 80f90229e5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-22 23:56:58 +01:00
Justin Clark-Casey (justincc) fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
2010-10-22 23:52:07 +01:00
Justin Clark-Casey (justincc) 21187f459e Merge remote branch 'otakup0pe/mantis5110' 2010-10-22 23:35:07 +01:00
Justin Clark-Casey (justincc) 8f34e46d74 Revert "* refactor refactor refactor ServerURI 4 lyfe"
This reverts commit 55974df14b.
2010-10-22 23:35:01 +01:00
Justin Clark-Casey (justincc) 783b1b548f Revert "* additional serveruri cleanup"
This reverts commit 19119d7705.
2010-10-22 23:34:53 +01:00
Jonathan Freedman 38e76d71ac Merge branch 'hg16' into mantis5110 2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc) a490b34b6e Revert "* more url / hg cleanup"
This reverts commit 58f75fa19d.
2010-10-22 23:34:44 +01:00