aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmergeMelanie2011-10-111-2/+4
|\
| * Null simulation data must return a non-null region settings or other parts ↵Dan Lake2011-09-201-2/+4
| | | | | | | | of the simulator expect
* | Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-203-66/+0
| |\
* | \ Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmergeMelanie2011-10-111-9/+13
|\ \ \ | |/ /
| * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
| | |
* | | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-113-66/+0
|\ \ \ | | |/ | |/|
| * | Remove vestigal OpenSim.Data mono addins extension points that don't look ↵Justin Clark-Casey (justincc)2011-09-203-66/+0
| |/ | | | | | | like they've been active for at least 2 and a half years
* | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/
| * adjust some whitespace to trigger another build, to check the last failure ↵Justin Clark-Casey (justincc)2011-09-171-2/+2
| | | | | | | | was just a glitch
* | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmergeMelanie2011-10-111-0/+2
|\ \ | |/
| * Add BulletSim physics option details to OpenSim.ini.example. Marked as in ↵Justin Clark-Casey (justincc)2011-09-171-0/+2
| | | | | | | | development and experimental.
* | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmergeMelanie2011-10-1111-7086/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml
| * Remove old bullet DotNET and X libraries in preparation for BulletSJustin Clark-Casey (justincc)2011-09-1711-7087/+1
| | | | | | | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
* | Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmergeMelanie2011-10-111-0/+6
|\ \ | |/
| * Add back BulletSPlugin.dll.config that I somehow managed to delete today in ↵Justin Clark-Casey (justincc)2011-09-171-0/+6
| | | | | | | | a00327d
* | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmergeMelanie2011-10-112-1/+7
|\ \ | |/
| * On setting a new avatar appearance, if height hasn't changed then don't set ↵Justin Clark-Casey (justincc)2011-09-172-1/+7
| | | | | | | | | | | | that same height in ScenePresence. This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself
* | Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Revert "uncomment Standalone config in OpenSim.ini.example."Justin Clark-Casey (justincc)2011-09-171-1/+1
| | | | | | | | | | | | | | This reverts commit 44a491f36bbe2094634e356591381c90f87e2125. This makes packaging OpenSim slightly easier but then generates a FriendsConnector error if naively used after compilation. So let's revert to stick with the "DataStore" error for now - at least that's a known error.
* | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-112-6/+23
|\ \ | |/
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-162-6/+23
| | | | | | | | | | | | When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor. This in turn reset Velocity, which cause the border stall. I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose
* | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * minor: I was wrong about OffsetPosition - sometimes it genuinely does return ↵Justin Clark-Casey (justincc)2011-09-161-0/+4
| | | | | | | | | | | | offset position! Add method doc to explain this.
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-114-7/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove setter from SP.OffsetPosition, since all sets should flow through ↵Justin Clark-Casey (justincc)2011-09-162-5/+23
| | | | | | | | | | | | SP.AbsolutePosition OffsetPosition is also misnamed - it returns the absolute position and never contains an offset.
* | Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmergeMelanie2011-10-111-6/+94
|\ \ | |/
| * Fix base_hair.dat to actually contain the base hair asset rather than base ↵Justin Clark-Casey (justincc)2011-09-161-6/+94
| | | | | | | | | | | | | | | | eyes by mistake. I must have had it cached last night. This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database). As a bonus, eyes now appear by default too!
* | Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-163-7/+3
| |\
* | \ Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmergeMelanie2011-10-111-91/+88
|\ \ \ | |/ /
| * | Updated some variables to be closer to the coding standards (and easier to ↵Kevin Houlihan2011-09-161-91/+88
| | | | | | | | | | | | | | | | | | | | | understand). There were a few variables in LocalConsole with single character names, and the class fields did not use the m_ prefix. I also removed a redundant variable, h. It was being set to 1 in a couple of places, and incremented in another, but never actually used.
* | | Merge commit '30b68388378f96f83b3f9509f72664869a6c20c6' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2011-09-161-1/+4
| |\ \ | | |/
* | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-113-7/+3
|\ \ \ | |/ /
| * | Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-163-7/+3
| | |
* | | Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmergeMelanie2011-10-111-1/+4
|\ \ \ | | |/ | |/|
| * | Passwords could be revealed in console by pressing backspace.Kevin Houlihan2011-09-161-1/+4
| |/ | | | | | | Pressing backspace causes hidden input (such as passwords) to be revealed on the console. The echo state was not being taken into account when handling a backspace key press.
* | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmergeMelanie2011-10-113-7/+71
|\ \ | |/
| * MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore ↵Chris Hart2011-09-163-7/+71
| | | | | | | | and InventoryStore
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-118-146/+267
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-168-146/+267
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-112-4/+14
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-162-4/+14
| |
* | Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmergeMelanie2011-10-113-2/+21
|\ \ | |/
| * On standalone, by default create the necessary minimum body parts and ↵Justin Clark-Casey (justincc)2011-09-163-2/+21
| | | | | | | | | | | | | | clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini This is left as false in grid mode
* | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-112-45/+52
|\ \ | |/
| * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-162-45/+52
| |
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-115-93/+69
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
| * Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-165-94/+70
| | | | | | | | entries on standalone if applicable.
generated by cgit v1.1 at 2024-12-21 14:04:44 +0000