Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 12 | -59/+116 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | provide avatar name in log if an exception ends up at the top of an async ↵ | Justin Clark-Casey (justincc) | 2010-11-12 | 1 | -2/+3 | |
| |/ | | | | | | | packet processing stack | |||||
| * | Add PARCEL_DETAILS_ID to LSL | BlueWall | 2010-11-12 | 2 | -0/+4 | |
| | | ||||||
| * | Prevent teleporting to a region when the egent is banned in all parcels | Melanie | 2010-11-10 | 1 | -0/+7 | |
| | | ||||||
| * | Remove a debug spam | Melanie | 2010-11-10 | 1 | -1/+0 | |
| | | ||||||
| * | Although the Allow Voice setting is per estate rather than per region, | Melanie | 2010-11-09 | 1 | -1/+3 | |
| | | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it. | |||||
| * | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 2 | -15/+15 | |
| | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 4 | -36/+35 | |
| | | ||||||
| * | Reinstate a lost fix | Melanie | 2010-11-08 | 1 | -2/+1 | |
| | | ||||||
| * | Fix merge artefacts | Melanie | 2010-11-08 | 1 | -14/+19 | |
| | | ||||||
| * | Prevent plants from being treated like dropped attachments and removed | Melanie | 2010-11-08 | 1 | -2/+1 | |
| | | | | | | | | from the sim. | |||||
| * | Call the cleanup after saving attachment states, so that the attachments | Melanie | 2010-11-08 | 1 | -1/+3 | |
| | | | | | | | | don't get killed before they can be saved | |||||
| * | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie | 2010-11-08 | 1 | -0/+3 | |
| | | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport | |||||
| * | Call attachment cleanup when an agent crosses out | Melanie Thielker | 2010-11-08 | 1 | -0/+2 | |
| | | ||||||
| * | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-11-08 | 1 | -0/+32 | |
| | | ||||||
| * | Detach attachments displaced by other attachments | Melanie | 2010-11-08 | 1 | -4/+8 | |
| | | ||||||
* | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 14 | -84/+158 | |
|\ \ | |/ | ||||||
| * | Fix playing sound from HUDs | Melanie | 2010-11-05 | 2 | -2/+17 | |
| | | ||||||
| * | Fix attached sounds from HUDs erroneously being delivered to other avatars | Melanie | 2010-11-05 | 1 | -0/+19 | |
| | | ||||||
| * | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 5 | -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 by | Melanie | 2010-11-03 | 2 | -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. | |||||
| * | Actually calculate the height before setting it, this isn't done automatically | Melanie | 2010-11-03 | 1 | -1/+7 | |
| | | | | | | | | on incoming transfers in all cases. | |||||
| * | Trying to prevent a wrong physical actor size | Melanie | 2010-11-03 | 1 | -0/+3 | |
| | | ||||||
| * | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 | |
| | | ||||||
| * | Fix sitting and standing up | Melanie | 2010-11-02 | 1 | -5/+14 | |
| | | ||||||
| * | Old deserialization can't deal with commas in flag fields. Making use of ↵ | Diva Canto | 2010-11-02 | 4 | -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: ↵ | dahlia | 2010-11-02 | 1 | -32/+32 | |
| | | | | | | | | | | | | osSetDynamicTextureURL crashed region server Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-31 | 1 | -2/+2 | |
|\ \ | |/ | ||||||
| * | Removed a couple of very verbose debug messages. | Diva Canto | 2010-10-31 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 3 | -16/+22 | |
|\ \ | |/ | ||||||
| * | Move physics actor creation to after SetHeight to try and prevent | Melanie | 2010-10-30 | 1 | -11/+11 | |
| | | | | | | | | bowlegginess. Didn't work but is better this way anyway. | |||||
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 2 | -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. | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵ | Teravus Ovares (Dan Olivares) | 2010-10-30 | 1 | -1/+1 | |
| | | | | | | | | to using prim.GetWorldPosition() in the warp renderer. | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 5 | -44/+26 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-30 | 2 | -16/+20 | |
| |\ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 1 | -1/+1 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 7 | -51/+53 | |
| | |\ \ | ||||||
| | * | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 2 | -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 code | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -22/+0 | |
| | |_|/ | |/| | | ||||||
| * | | | Set async_packet_handling = true by default | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -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-30 | 1 | -5/+6 | |
| | | | | | | | | | | | | appropriate debug to reduce console spam when log level is info | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 6 | -46/+47 | |
|\ \ \ | |/ / | ||||||
| * | | tweak a few more scene presence logging messages for consistency | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+3 | |
| | | | ||||||
| * | | Rationalize the logging messages from the merged appearance branch, ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 2 | -34/+23 | |
| | | | | | | | | | | | | commenting out most of them as per Mic | |||||
| * | | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 5 | -10/+22 | |
| |\ \ | | |/ | |/| | ||||||
| | * | add timing report to CompleteScenePresence for diagnostic purposes | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+8 | |
| | | | ||||||
| | * | for now, comment out some older or redundant log debug lines to make ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 3 | -5/+5 | |
| | | | | | | | | | | | | diagnostics easier | |||||
| | * | Add number of ms it takes to complete UseCircuitCode packet handling to log ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -2/+8 | |
| | | | | | | | | | | | | for diagnostics | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -63/+154 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs |