aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmergeMelanie2011-10-111-0/+41
|\
| * llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
| | | | | | | | | | | | when an avatar sits on a prim, we get now his key & name ;-) http://opensimulator.org/mantis/view.php?id=4476
* | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmergeMelanie2011-10-111-1/+8
|\ \ | |/
| * Add ability to pass in the permissions option (perm) to save oar via RemoteAdminJustin Clark-Casey (justincc)2011-10-011-1/+8
| | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=5686 Thanks Michelle Argus!
* | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmergeMelanie2011-10-112-8/+14
|\ \ | |/
| * minor: remove clutter null check from pass in config to ↵Justin Clark-Casey (justincc)2011-10-012-8/+14
| | | | | | | | | | | | AvatarFactoryModule.Initialize() This is never null
* | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmergeMelanie2011-10-112-19/+38
|\ \ | |/
| * copy config information on allow/disallow individual os functions into ↵Justin Clark-Casey (justincc)2011-09-302-19/+38
| | | | | | | | | | | | OpenSim.ini.example I this is generally useful rather than a 'default' setting
* | Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmergeMelanie2011-10-111-0/+0
|\ \ | |/
| * remove unused postgresql dllJustin Clark-Casey (justincc)2011-09-301-0/+0
| |
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-115-7/+66
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-305-6/+65
| | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmergeMelanie2011-10-113-0/+20
|\ \ | |/
| * llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
| | | | | | | | http://wiki.secondlife.com/wiki/LlAvatarOnLinkSitTarget
* | Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmergeMelanie2011-10-111-0/+5
|\ \ | |/
| * Add en_US culture setting to the async delete to inventory thread, to avoid ↵Justin Clark-Casey (justincc)2011-09-261-0/+5
| | | | | | | | | | | | | | | | any issues with float serialization with machines set to non en_US locales. Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708, though if it does I'm really surprised not to have seen it before now. Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead. But don't want to do something like that this close to a release.
* | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-112-1/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ↵Snoopy Pfeffer2011-09-252-2/+11
| | | | | | | | are only sent to affected clients.
* | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmergeMelanie2011-10-111-9/+0
|\ \ | |/
| * Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-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 bigmergeMelanie2011-10-111-30/+0
|\ \ | |/
| * Removed uncalled region load method.Kevin Houlihan2011-09-241-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 bigmergeMelanie2011-10-116-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 Argus2011-09-246-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 bigmergeMelanie2011-10-111-1/+11
|\ \ | |/
| * Don't try and resolve user account for authorization if the agent has come ↵Justin Clark-Casey (justincc)2011-09-241-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 bigmergeMelanie2011-10-111-14/+17
|\ \ | |/
| * Improve locking when access queue in EventQueueGetModuleJustin Clark-Casey (justincc)2011-09-241-14/+17
| |
* | Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmergeMelanie2011-10-112-5/+13
|\ \ | |/
| * Clarify explanation of the "DeleteScriptsOnStartup" config switch and add ↵Justin Clark-Casey (justincc)2011-09-242-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 bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * make distribution creating code to copy FlotsamCache.ini.example to ↵Justin Clark-Casey (justincc)2011-09-241-0/+1
| | | | | | | | FlotsamCache.ini
* | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
| |
* | Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Correct asset id of library default iris texture.Justin Clark-Casey (justincc)2011-09-231-1/+1
| | | | | | | | For this change to show up you will need to clear viewer cache.
* | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-118-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-238-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 bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-221-5/+5
| |\
* | \ Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmergeMelanie2011-10-112-9/+18
|\ \ \ | |/ /
| * | Fix failure to teleport when an agent is lured on the same sim (and probably ↵Justin Clark-Casey (justincc)2011-09-222-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 bigmergeMelanie2011-10-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-2112-90/+28
| |\ \ | | |/
* | | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmergeMelanie2011-10-111-5/+5
|\ \ \ | |/ /
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
| | |
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-1112-90/+28
|\ \ \ | | |/ | |/|
| * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-2212-90/+28
| |/ | | | | | | This is moved into ScenePresence for now as a general facility
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-113-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-213-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.
generated by cgit v1.1 at 2024-12-16 05:48:06 +0000