| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 |
|\ |
|
| * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+0 |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+2 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+2 |
* | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 |
|\ \
| |/ |
|
| * | Restore [Startup] physical_prim flag which can stop any prims being subject t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -0/+6 |
* | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+8 |
|\ \
| |/ |
|
| * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+8 |
* | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 2 | -38/+0 |
|\ \
| |/ |
|
| * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -38/+0 |
* | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 |
* | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -2/+1 |
| |\ |
|
* | \ | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+0 |
|\ \ \
| |/ / |
|
| * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -3/+0 |
* | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -2/+1 |
| |/ |
|
* | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+1 |
* | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 2 | -35/+62 |
|\ \
| |/ |
|
| * | Added a setting to [Startup] section of config that will allow the simulator ... | Kevin Houlihan & Michelle Argus | 2011-09-24 | 2 | -21/+51 |
* | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 2 | -0/+3 |
|\ \
| |/ |
|
| * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 2 | -0/+3 |
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
* | | Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge | Melanie | 2011-10-11 | 1 | -91/+88 |
|\ \
| |/ |
|
| * | Updated some variables to be closer to the coding standards (and easier to un... | Kevin Houlihan | 2011-09-16 | 1 | -91/+88 |
* | | Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+4 |
|\ \
| |/ |
|
| * | Passwords could be revealed in console by pressing backspace. | Kevin Houlihan | 2011-09-16 | 1 | -1/+4 |
* | | Bring us up to date. | Tom | 2011-09-14 | 3 | -20/+96 |
|\ \
| |/ |
|
| * | In an object return message, send a null-terminated empty string in binary bu... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -2/+40 |
| * | lock AvatarAppearance.m_attachments when we use it | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -33/+58 |
| * | lock attachments when enumerating through them in ScenePresence.CopyTo(). | Justin Clark-Casey (justincc) | 2011-09-10 | 1 | -1/+0 |
| * | In SetAttachment, if the existing attachment has no asset id then carry on ra... | Justin Clark-Casey (justincc) | 2011-09-06 | 2 | -3/+34 |
| * | Stop the pointless double setting of every attachment in AvatarAppearance. | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -4/+10 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 17 | -207/+262 |
|\ \
| |/ |
|
| * | Stop NPCs losing attachments when the source avatar takes them off. | Justin Clark-Casey (justincc) | 2011-09-03 | 2 | -3/+14 |
| * | If a FireAndForget thread terminates with an exception, then catch and log ra... | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+15 |
| * | add Name property to ISceneEntity | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -0/+1 |
| * | refactor: migrate DropObject handling fully into AttachmentsModule from Scene | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| * | Fix bug where attachments were remaining on the avatar after being dropped. | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -2/+5 |
| * | Move GetMeshKey from buried inside Meshmerizer to a public method on Primitiv... | Robert Adams | 2011-08-28 | 1 | -0/+61 |
| * | read m_rpcHandlersKeepAlive under appropriate lock | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| * | oops, fix build break from last commit | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -12/+8 |
| * | improve locking of m_agentHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -10/+10 |
| * | improve locking of m_HTTPHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+2 |
| * | improve locking of m_streamHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| * | remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSD... | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -11/+6 |
| * | improve locking of m_llsdHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -30/+32 |