| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 | |
| | |\ \ | ||||||
| * | \ \ | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 4 | -8/+28 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 4 | -8/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership. | |||||
| * | | | | Merge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-10-04 | 6 | -393/+393 | |
| | |\ \ \ | | |/ / | ||||||
| * | | | | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Turn off keepalives when commands are specified | Mic Bowman | 2011-10-04 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge commit '8a216dc1ccdc336a22958cd476de034d065cf676' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 4 | -384/+385 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| * | | | | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge | Melanie | 2011-10-12 | 2 | -9/+8 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. | Justin Clark-Casey (justincc) | 2011-10-04 | 2 | -9/+8 | |
| | | |/ | |/| | ||||||
| * | | | Fix rezzing coalesced object broken by core merge | Melanie | 2011-10-12 | 1 | -54/+36 | |
| | | | | ||||||
| * | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-12 | 105 | -10275/+2555 | |
| |\ \ \ | ||||||
| | * \ \ | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 4 | -427/+409 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||||
| | | * | | Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵ | Dan Lake | 2011-10-04 | 4 | -384/+385 | |
| | | |/ | | | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections | |||||
| | * | | Merge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 | |
| | |\ \ | | |/ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 5 | -68/+73 | |
| | | |\ | ||||||
| | * | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 6 | -135/+86 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | | Removed redundant code in AttachmentsModule and simplified interfaces which ↵ | Dan Lake | 2011-10-03 | 6 | -131/+83 | |
| | | | | | | | | | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | |||||
| | * | | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | trival tweak to trigger the continuous integration system | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+13 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||||
| | | * | | Animation-States Turning Left, Turning Right implemented/enabled | Pixel Tomsen | 2011-10-04 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=3036 | |||||
| | * | | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | Return NULL_KEY from llGetTexture if a non-existent face is indicated, ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | rather than "" As per http://wiki.secondlife.com/wiki/LlGetTexture | |||||
| | * | | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+16 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | For llGetTexture(), if the face texture asset is in the inventory, return ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the inventory name rather than the asset UUID This is as per http://wiki.secondlife.com/wiki/LlGetTexture Applied patch in http://opensimulator.org/mantis/view.php?id=4552 with an additional break statement if an inventory item is found to exit early. Thanks Michelle Argus! | |||||
| | * | | | 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 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 3 | -63/+49 | |
| | | | | | | | | | | | | | | | | | This appears to be code clutter since the code that uses this has long gone. | |||||
| | * | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 4 | -11/+10 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||||
| | | * | | 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 | |
| | | | | | | | | | | | | | | | | SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase. No point making the code more complex until it actually needs to be, | |||||
| | * | | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge | Melanie | 2011-10-11 | 8 | -1668/+0 | |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Examples/SimpleModule/ComplexObject.cs OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||||
| | | * | Remove OpenSim.Region.Examples.SimpleModule | Justin Clark-Casey (justincc) | 2011-10-01 | 8 | -1662/+0 | |
| | | | | | | | | | | | | | | | | This module is more than 2 years old and at least some of the 'example' code it gives is now misleading. Even the logs say it say some bits were broken where it was put in! | |||||
| | * | | 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 | |
| | | | | | | | | | | | | | | | | | | | 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 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 | |
| | | | | | | | | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=5686 Thanks Michelle Argus! | |||||
| | * | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 2 | -8/+14 | |
| | |\ \ | | |/ | ||||||
| | | * | minor: remove clutter null check from pass in config to ↵ | Justin Clark-Casey (justincc) | 2011-10-01 | 2 | -8/+14 | |
| | | | | | | | | | | | | | | | | | | | AvatarFactoryModule.Initialize() This is never null | |||||
| | * | | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge | Melanie | 2011-10-11 | 2 | -19/+38 | |
| | |\ \ | | |/ | ||||||
| | | * | copy config information on allow/disallow individual os functions into ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -19/+38 | |
| | | | | | | | | | | | | | | | | | | | OpenSim.ini.example I this is generally useful rather than a 'default' setting | |||||
| | * | | 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 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |