aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix merge artefactsMelanie2010-11-052-59/+22
| |
* | Revert "Spin the AddNewClient process off into a new thread to avoid locking ↵Melanie2010-11-051-24/+1
| | | | | | | | | | | | | | | | | | | | up the LLUDPServer (and therefore the entire scene)" This reverts commit 40e05f41098bdedac7296d84c9aa8d915c5c9ede. Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-055-75/+63
| | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Fix child prims returning after being unlinked and deleted where the root isMelanie2010-11-041-0/+5
| | | | | | | | not deleted
* | Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
| |
* | Fix creation of a duplicate physics actor on chained drag-copy operations,Melanie2010-11-041-17/+0
| | | | | | | | the main cause for "ghost prims"
* | Fix playing sound from HUDsMelanie2010-11-032-10/+16
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-036-1/+33
|\ \ | |/
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-035-0/+24
| | | | | | | | from a region and allow normal day cycles to be reestablished
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-032-1/+3
| | | | | | | | | | | | midday defaults when no specific LightShare profile is set. This prevents LightShare info being send out when the region has no LightShare profile, allowing normal day/night cycles to happen.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| | | | | | | | on incoming transfers in all cases.
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-0216-190/+185
|\ \ | |/
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| |
| * Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2010-11-024-21/+30
| | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
| * Thanks Snoopy for a patch that addresses Mantis #0005165: ↵dahlia2010-11-021-32/+32
| | | | | | | | | | | | osSetDynamicTextureURL crashed region server Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
| * Removed a couple of very verbose debug messages.Diva Canto2010-10-311-2/+2
| |
| * 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-302-5/+11
| | | | | | | | | | | | 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.
| * * 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://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-302-16/+20
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-1/+1
| | |\
| | * \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-307-51/+53
| | |\ \
| | * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-302-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| | |_|/ | |/| |
| * | | Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-301-1/+1
| | |/ | |/| | | | | | | | | | | | | 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-301-5/+6
| | | | | | | | | | | | appropriate debug to reduce console spam when log level is info
| * | 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-292-34/+23
| | | | | | | | | | | | commenting out most of them as per Mic
| * | Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-295-10/+22
| |\ \ | | |/ | |/|
| | * 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-293-5/+5
| | | | | | | | | | | | 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 careminster-presence-refactorMelanie2010-10-296-116/+327
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-296-116/+327
| |\ \
| | * | 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-294-63/+115
| | | | | | | | | | | | | | | | | | | | 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-281-4/+14
| | | |
| | * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2820-120/+259
| | |\ \ | | | |/
| | * | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-55/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
| | * | 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-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-212-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' into careminster-presence-refactorMelanie2010-10-2913-281/+234
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-2911-270/+233
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-2111-271/+235
| | |\ \ \ | | | |/ / | | | | | | | | | | dev-appearance
| | | * | Major refactoring of appearance handling.Master ScienceSim2010-10-2011-270/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.