| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+0 | |
| | |\ \ | | |/ | ||||||
| | | * | Remove the unimplented "clear assets" command. | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -9/+0 | |
| | | | | | | | | | | | | | | | | This was a bizarre relic of a bygone age that had no implementations. If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command | |||||
| | * | | Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge | Melanie | 2011-10-11 | 1 | -30/+0 | |
| | |\ \ | | |/ | ||||||
| | | * | Removed uncalled region load method. | Kevin Houlihan | 2011-09-24 | 1 | -30/+0 | |
| | | | | | | | | | | | | | The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module. | |||||
| | * | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 6 | -38/+78 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||||
| | | * | Added a setting to [Startup] section of config that will allow the simulator ↵ | Kevin Houlihan & Michelle Argus | 2011-09-24 | 6 | -24/+67 | |
| | | | | | | | | | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region. | |||||
| | * | | Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+11 | |
| | |\ \ | | |/ | ||||||
| | | * | Don't try and resolve user account for authorization if the agent has come ↵ | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in via hypergrid. If a user account isn't available, this just passes on the name given by the agent instead. I'm not sure this is particularly useful since I believe that agent names could be faked in this context - it might be no more useful than a viewer agent string. In fact, there might even be an argument that passing on this name provides a false expectation of authenticity. However, I will apply for now. Patch applied from http://opensimulator.org/mantis/view.php?id=5696 Thanks Michelle Argus. | |||||
| | * | | Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+17 | |
| | |\ \ | | |/ | ||||||
| | | * | Improve locking when access queue in EventQueueGetModule | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -14/+17 | |
| | | | | ||||||
| | * | | Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge | Melanie | 2011-10-11 | 2 | -5/+13 | |
| | |\ \ | | |/ | ||||||
| | | * | Clarify explanation of the "DeleteScriptsOnStartup" config switch and add ↵ | Justin Clark-Casey (justincc) | 2011-09-24 | 2 | -5/+13 | |
| | | | | | | | | | | | | | | | | | | | this to OpenSim.ini.example since it's very useful if you're not updating OpenSim from source. On reflection, "DeleteScriptsOnStartup" isn't a great name since it suggests real script deletion rather than compiled versions. | |||||
| | * | | Merge commit 'def74404f1ea6b2a0f479c602fd67bcfced41426' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+1 | |
| | |\ \ | | |/ | ||||||
| | | * | make distribution creating code to copy FlotsamCache.ini.example to ↵ | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | FlotsamCache.ini | |||||
| | * | | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+0 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | | * | remove unused SOP.Create() method | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -14/+0 | |
| | | | | ||||||
| | * | | Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 | |
| | |\ \ | | |/ | ||||||
| | | * | Correct asset id of library default iris texture. | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | For this change to show up you will need to clear viewer cache. | |||||
| | * | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 8 | -109/+270 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||||
| | | * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 8 | -93/+270 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made. | |||||
| | * | | Merge commit '41616cad09ad5a2936635dfca4caf38c89d00b38' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 | |
| | |\ \ | | |/ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -5/+5 | |
| | | |\ | ||||||
| | * | \ | Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge | Melanie | 2011-10-11 | 2 | -9/+18 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Fix failure to teleport when an agent is lured on the same sim (and probably ↵ | Justin Clark-Casey (justincc) | 2011-09-22 | 2 | -9/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in neighbouring sims) with HG lure active It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar. However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour. We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690 | |||||
| | * | | | Merge commit '28a482a7ee2cebab1aa720477af175d7e26d702e' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-21 | 12 | -90/+28 | |
| | | |\ \ | | | |/ | ||||||
| | * | | | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge | Melanie | 2011-10-11 | 1 | -5/+5 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Commented out new debug statements in ScenePresence | Dan Lake | 2011-09-21 | 1 | -5/+5 | |
| | | | | | ||||||
| | * | | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 12 | -90/+28 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 12 | -90/+28 | |
| | | |/ | | | | | | | | | | This is moved into ScenePresence for now as a general facility | |||||
| | * | | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge | Melanie | 2011-10-11 | 3 | -2/+203 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | | * | Move code which handles NPC movement into Scene so that this can also be ↵ | Justin Clark-Casey (justincc) | 2011-09-21 | 3 | -1/+203 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | used by Autopilot coming from the client side. I thought that I had implemented this but must have accidentally removed it. Adds a regression test to detect if this happens again. Temporarily disables automatic landing of NPC at a target. Will be fixed presently. | |||||
| | * | | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge | Melanie | 2011-10-11 | 1 | -8/+0 | |
| | |\ \ | | |/ | ||||||
| | | * | Remove unused and never set SP.PreviousRotation | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -8/+0 | |
| | | | | ||||||
| | * | | Merge commit '572b680cb01a856f860b1e3fb40a7153a36113f2' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | | * | get rid of an incredibly noisy logging message from the last commit | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 | |
| | |\ \ | | |/ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-21 | 2 | -12/+18 | |
| | | |\ | ||||||
| | * | \ | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 3 | -5/+110 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | | * | | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. | Justin Clark-Casey (justincc) | 2011-09-21 | 3 | -6/+115 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stops the npc walking backwards if the target is directly behind. This means that the npc no longer returns to its original rotation once movement has finished. If you want this behaviour, please store and reset the original rotation after movement. This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678 | |||||
| | * | | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+4 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Null simulation data must return a non-null region settings or other parts ↵ | Dan Lake | 2011-09-20 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | of the simulator expect | |||||
| | * | | | Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-20 | 3 | -66/+0 | |
| | | |\ \ | | | |/ | ||||||
| | * | | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+13 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Make debug statements in ScenePresence consistent and add a few more | Dan Lake | 2011-09-20 | 1 | -10/+14 | |
| | | | | | ||||||
| | * | | | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge | Melanie | 2011-10-11 | 3 | -66/+0 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Remove vestigal OpenSim.Data mono addins extension points that don't look ↵ | Justin Clark-Casey (justincc) | 2011-09-20 | 3 | -66/+0 | |
| | | |/ | | | | | | | | | | like they've been active for at least 2 and a half years | |||||
| | * | | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 | |
| | |\ \ | | |/ | ||||||
| | | * | adjust some whitespace to trigger another build, to check the last failure ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | | was just a glitch | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |