aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-308-88/+168
|\
| * Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.Diva Canto2010-10-301-0/+3
| |
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| | | | | | | | bowlegginess. Didn't work but is better this way anyway.
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-307-77/+154
| | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-309-17070/+17066
|\ \ | |/
| * * 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 ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-301-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.
| * | * 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' into mantis5110Jonathan Freedman2010-10-3019-490/+349
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-303-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
| | | |
| * | | 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 melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-2/+3
| |\ \ | | |/
| | * 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.
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-3011-103/+98
| |\ \ | | |/
| | * 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
| * | 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' into mantis5110Jonathan Freedman2010-10-299-70/+64
|\ \ \ | | |/ | |/|
| * | tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| | |
| * | 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 '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' into mantis5110Jonathan Freedman2010-10-299-82/+304
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | 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 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.
| * | | Add my work on top of cmickeyb'sMelanie2010-10-293-1/+133
| | | |
| * | | Merge branch 'dev-appearance'Melanie2010-10-2928-779/+954
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-2128-780/+956
| | |\ \ \ | | | | | | | | | | | | | | | | | | dev-appearance
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-294-235/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This work conflicts with cmickeyb's more extensive, related work This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f.
| * | | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-294-261/+235
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-23/+30
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| * | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵Marck2010-10-282-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096.
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-2942-934/+1275
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | 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
| |\ \ \ \ | | |/ / /
| | * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
| | | | |
| | * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| | | | |
| | * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-269-63/+37
| | |\ \ \
| | | * | | Formatting cleanup.Jeff Ames2010-10-279-63/+37
| | | | | |
| | * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵dahlia2010-10-261-9/+27
| | |/ / / | | | | | | | | | | | | | | | specific applications
| * | | | 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.
generated by cgit v1.1 at 2024-08-23 12:50:53 +0000