Commit Graph

13553 Commits (574bc590a2a9d8a17f4bdf035de580af8bb97386)

Author SHA1 Message Date
opensim mirror account 574bc590a2 Merge branch 'master' of /var/git/opensim/ 2010-10-29 23:30:05 -07:00
Teravus Ovares (Dan Olivares) 09bf9d5fca * AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer. 2010-10-30 02:26:48 -04:00
opensim mirror account 6d52c42de2 Merge branch 'master' of /var/git/opensim/ 2010-10-29 23:10:04 -07:00
Teravus Ovares (Dan Olivares) 37e6de5ace Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-30 02:07:27 -04:00
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
opensim mirror account e6f7d312dd Merge branch 'master' of /var/git/opensim/ 2010-10-29 20:30:07 -07:00
opensim mirror account e6a7b66b08 Merge branch 'master' of /var/git/opensim/ 2010-10-29 19:50:06 -07:00
Melanie d0895a4a3a On first login, Ruth is back now. Strangely, inventory items are created for
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
2010-10-30 03:28:59 +01:00
opensim mirror account dcd5cf6bde Merge branch 'master' of /var/git/opensim/ 2010-10-29 19:20:06 -07:00
opensim mirror account 9beefc4ea9 Merge branch 'master' of /var/git/opensim/ 2010-10-29 19:10:04 -07: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 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
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
opensim mirror account f8471de004 Merge branch 'master' of /var/git/opensim/ 2010-10-29 17:50:04 -07:00
opensim mirror account 7df180c18e Merge branch 'master' of /var/git/opensim/ 2010-10-29 17:40:03 -07: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
opensim mirror account ae12bcc43c Merge branch 'master' of /var/git/opensim/ 2010-10-29 16:00:05 -07:00
Justin Clark-Casey (justincc) 09705514ff tweak a few more scene presence logging messages for consistency 2010-10-29 23:52:25 +01:00
opensim mirror account f6b88d6208 Merge branch 'master' of /var/git/opensim/ 2010-10-29 15:50:06 -07: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
opensim mirror account 45c6ce65f5 Merge branch 'master' of /var/git/opensim/ 2010-10-29 15:20:04 -07: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
opensim mirror account 4a56ea8d88 Merge branch 'master' of /var/git/opensim/ 2010-10-29 14:10:10 -07:00
opensim mirror account 8d002c4553 Merge branch 'master' of /var/git/opensim/ 2010-10-29 14:00:07 -07: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
opensim mirror account 8acf8eb481 Merge branch 'master' of /var/git/opensim/ 2010-10-29 13:40:07 -07: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
opensim mirror account 8d8a795b28 Merge branch 'master' of /var/git/opensim/ 2010-10-29 13:20:04 -07: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
opensim mirror account 448b83b105 Merge branch 'master' of /var/git/opensim/ 2010-10-29 11:50:10 -07:00
Melanie 9c829c0410 Preliminary work on appearance layers. No user functionality yet. 2010-10-29 18:58:22 +01:00
opensim mirror account 8b867ba23e Merge branch 'master' of /var/git/opensim/ 2010-10-28 17:40:06 -07: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