aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-1/+1
|\ \ | |/
| * * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵Teravus Ovares (Dan Olivares)2010-10-301-1/+1
| | | | | | | | to using prim.GetWorldPosition() in the warp renderer.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-297-17065/+17065
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-301-4/+0
| |\
| * | * Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.Teravus Ovares (Dan Olivares)2010-10-307-17065/+17065
| | | | | | | | | | | | * This is libOMV SVN revision 3463.
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-4/+0
|\ \ \ | | |/ | |/|
| * | On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
| |/ | | | | | | | | tattoo and alpha layers. Any change of appearance in the sim makes the green gnome reappear on next login. Progress of sorts.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-2/+0
|\ \ | |/
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-59/+80
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-303-25/+5
| |\
| * | This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-304-59/+80
| | | | | | | | | | | | client displays a blank error box.
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-293-25/+5
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-3011-423/+282
| |\ \ | | |/
| * | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| | |
| * | Clarify comment for configuration option Check4096 and show the default value.Marck2010-10-302-3/+5
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2911-423/+282
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-2/+3
| |\ \ | | |/
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-3011-103/+98
| |\ \
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-3011-423/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-35/+37
|\ \ \ \ | | |_|/ | |/| |
| * | | Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-302-2/+3
| | |/ | |/| | | | | | | | | | | | | 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.
| * | Change level of some logging messages, turning some info into arguably more ↵Justin Clark-Casey (justincc)2010-10-302-33/+34
| | | | | | | | | | | | appropriate debug to reduce console spam when log level is info
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-291-3/+3
|\ \ \ | |/ /
| * | tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-294-57/+39
|\ \ \ | |/ /
| * | Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-294-57/+39
| | | | | | | | | | | | commenting out most of them as per Mic
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-296-11/+23
|\ \ \ | |/ /
| * | Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-296-11/+23
| |\ \ | | |/ | |/|
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
| | |
| | * for now, comment out some older or redundant log debug lines to make ↵Justin Clark-Casey (justincc)2010-10-294-6/+6
| | | | | | | | | | | | diagnostics easier
| | * Add number of ms it takes to complete UseCircuitCode packet handling to log ↵Justin Clark-Casey (justincc)2010-10-291-2/+8
| | | | | | | | | | | | for diagnostics
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-292-1/+1
|\ \ \ | |/ /
| * | Rename the new default texture to be consistent with the othersMelanie2010-10-292-1/+1
| | |
| * | Add a default alpha layerMelanie2010-10-291-0/+0
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2914-303/+567
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-2914-303/+567
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-292-2/+41
| | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later.
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-295-81/+132
| | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| | * | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-283-5/+41
| | | |
| | * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2828-130/+273
| | |\ \
| | * | | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-282-59/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
| | * | | Small cleanup and add more debugging informationMaster ScienceSim2010-10-262-8/+23
| | | | |
| | * | | Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| | | | | | | | | | | | | | | | | | | | a bigger clean up that needs to happen around locks on appearance.
| | * | | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-254-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Intermediate commit for backward compatability; does not compile yetMic Bowman2010-10-252-62/+73
| | | | |
| | * | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-216-111/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly.
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-293-1/+133
|\ \ \ \ \ | |/ / / /
| * | | | Add my work on top of cmickeyb'sMelanie2010-10-293-1/+133
| | | | |
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-2931-766/+967
|\ \ \ \ \ | |/ / / /