| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ |
|
| * | Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
* | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+16 |
|\ \
| |/ |
|
| * | For llGetTexture(), if the face texture asset is in the inventory, return the... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+16 |
* | | Merge commit '34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 5 | -12/+11 |
| |\ |
|
* | \ | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 3 | -58/+51 |
|\ \ \
| |/ / |
|
| * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 3 | -63/+49 |
* | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 4 | -11/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 4 | -12/+11 |
* | | | Merge commit '31125a5fd275a37261d87a336385f5447a62004e' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+0 |
|\ \ \
| |/ / |
|
| * | | Add execute permission to runprebuild2010.bat | Dan Lake | 2011-10-03 | 1 | -0/+0 |
| |/ |
|
* | | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge | Melanie | 2011-10-11 | 4 | -17/+1 |
|\ \
| |/ |
|
| * | Remove unimplementated UpdateMovement() methods from SOG, SOP. | Justin Clark-Casey (justincc) | 2011-10-01 | 4 | -17/+1 |
* | | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge | Melanie | 2011-10-11 | 8 | -1668/+0 |
|\ \
| |/ |
|
| * | Remove OpenSim.Region.Examples.SimpleModule | Justin Clark-Casey (justincc) | 2011-10-01 | 8 | -1662/+0 |
* | | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+41 |
|\ \
| |/ |
|
| * | llGetLinkKey, llGetLinkName Fix for sitting Avatar | Pixel Tomsen | 2011-10-01 | 1 | -0/+41 |
* | | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+8 |
|\ \
| |/ |
|
| * | Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -1/+8 |
* | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 2 | -8/+14 |
|\ \
| |/ |
|
| * | minor: remove clutter null check from pass in config to AvatarFactoryModule.I... | Justin Clark-Casey (justincc) | 2011-10-01 | 2 | -8/+14 |
* | | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge | Melanie | 2011-10-11 | 2 | -19/+38 |
|\ \
| |/ |
|
| * | copy config information on allow/disallow individual os functions into OpenSi... | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -19/+38 |
* | | Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+0 |
|\ \
| |/ |
|
| * | remove unused postgresql dll | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+0 |
* | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 5 | -7/+66 |
|\ \
| |/ |
|
| * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 5 | -6/+65 |
* | | Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge | Melanie | 2011-10-11 | 3 | -0/+20 |
|\ \
| |/ |
|
| * | llAvatarOnLinkSitTarget Implementation | Pixel Tomsen | 2011-09-29 | 3 | -0/+20 |
* | | Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Add en_US culture setting to the async delete to inventory thread, to avoid a... | Justin Clark-Casey (justincc) | 2011-09-26 | 1 | -0/+5 |
* | | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge | Melanie | 2011-10-11 | 2 | -1/+14 |
|\ \
| |/ |
|
| * | Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar... | Snoopy Pfeffer | 2011-09-25 | 2 | -2/+11 |
* | | 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 |
* | | 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 |
* | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 6 | -38/+78 |
|\ \
| |/ |
|
| * | Added a setting to [Startup] section of config that will allow the simulator ... | Kevin Houlihan & Michelle Argus | 2011-09-24 | 6 | -24/+67 |
* | | 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 in... | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -1/+11 |
* | | 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 thi... | Justin Clark-Casey (justincc) | 2011-09-24 | 2 | -5/+13 |
* | | Merge commit 'def74404f1ea6b2a0f479c602fd67bcfced41426' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | make distribution creating code to copy FlotsamCache.ini.example to FlotsamCa... | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -0/+1 |
* | | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+0 |
|\ \
| |/ |
|
| * | remove unused SOP.Create() method | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -14/+0 |