| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ |
|
| | * | correct misleading method doc on CreateNotecardAsset() | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+1 |
| * | | Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | in AssetHelpers, store the actual text passed in to the method, not the strin... | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -2/+2 |
| * | | Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 |
| |\ \
| |/ |
|
| | * | encode notecard assets in proper format for tests, rather than just using wha... | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+6 |
| * | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 4 | -10/+10 |
| |\ \
| |/ |
|
| | * | refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss... | Justin Clark-Casey (justincc) | 2011-10-22 | 4 | -10/+10 |
| * | | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge | Melanie | 2011-10-25 | 1 | -21/+41 |
| |\ \
| |/ |
|
| | * | RemoteAdmin - Added optional terrain loading on region create using parameter... | Michelle Argus | 2011-10-21 | 1 | -21/+41 |
| * | | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 |
| |\ \
| |/ |
|
| | * | very minor removal of old commented out line of code in OdeScene | Justin Clark-Casey (justincc) | 2011-10-21 | 1 | -5/+3 |
| * | | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+0 |
| |\ \
| |/ |
|
| | * | remove unnecessary null check on _collisionEventPrim | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -3/+0 |
| * | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 3 | -25/+32 |
| |\ \
| |/ |
|
| | * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 3 | -25/+32 |
| * | | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+4 |
| |\ \
| |/ |
|
| | * | Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma... | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -12/+4 |
| * | | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge | Melanie | 2011-10-25 | 2 | -13/+5 |
| |\ \
| |/ |
|
| | * | For now, stop passing timeStep into methods where it's not actually used. | Justin Clark-Casey (justincc) | 2011-10-20 | 2 | -13/+5 |
| * | | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | Change wording on asset requests. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+2 |
| * | | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 |
| |\ \
| |/ |
|
| | * | Removed redundant NotInTransit function from ScenePresence. IsInTransit=false... | Dan Lake | 2011-10-19 | 1 | -5/+0 |
| * | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 5 | -318/+318 |
| |\ \
| |/ |
|
| | * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e... | Dan Lake | 2011-10-19 | 5 | -318/+318 |
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2011-10-19 | 2 | -72/+100 |
| | |\ |
|
| * | \ | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 9 | -344/+319 |
| |\ \ \
| |/ / |
|
| | * | | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... | Dan Lake | 2011-10-19 | 9 | -344/+319 |
| * | | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge | Melanie | 2011-10-25 | 2 | -41/+118 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Extend scripts stop/start/suspend/resume console commands to allow action on ... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -72/+100 |
| | |/ |
|
| | * | Add "scripts stop" and "scripts start" console commands. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+48 |
| | * | minor: improve command help on scripts suspend/resume | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+5 |
| * | | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge | Melanie | 2011-10-25 | 2 | -22/+54 |
| |\ \
| |/ |
|
| | * | Fix resume scripts. | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -9/+33 |
| * | | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+52 |
| |\ \
| |/ |
|
| | * | Add "scripts suspend" and "scripts resume" commands. | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -3/+53 |
| * | | Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | on log and "show scripts" messages, show script item UUID rather than asset UUID | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -4/+4 |
| * | | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+31 |
| |\ \
| |/ |
|
| | * | add current script status to "scripts show" command (running, suspended, etc.) | Justin Clark-Casey (justincc) | 2011-10-19 | 3 | -7/+31 |
| * | | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+28 |
| |\ \
| |/ |
|
| | * | Add "show scripts" command to show all scripts currently known to the script ... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -2/+28 |
| * | | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge | Melanie | 2011-10-25 | 2 | -23/+46 |
| |\ \
| |/ |
|
| | * | Add option to allow remote http calls to setpassword in the AuthenticationSer... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -23/+46 |
| * | | Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | Slightly change log message in LoadRegionsPlugin | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -1/+1 |
| * | | Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+13 |
| |\ \
| |/ |
|
| | * | Region-UUID - can not be zero-uuid | Pixel Tomsen | 2011-10-19 | 1 | -1/+13 |
| * | | Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge | Melanie | 2011-10-25 | 1 | -11/+6 |
| |\ \
| |/ |
|
