| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 19 | -3/+19 |
| |\ | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 19 | -3/+19 |
| | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
| * | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+10 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | ||||
| | * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -1/+10 |
| | | | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey | ||||
| * | | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Fix missing Busy-Mode Response | Pixel Tomsen | 2011-10-22 | 1 | -0/+1 |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5748 | ||||
| * | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | refactor: rename some AssetHelpers.CreateAsset() methods to ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -4/+4 |
| | | | | | | | | | CreateNotecardAsset() | ||||
| * | | 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 |
| | | | | | | | | | Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text. | ||||
| * | | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge | Melanie | 2011-10-25 | 2 | -268/+268 |
| |\ \ | |/ | |||||
| | * | Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵ | Dan Lake | 2011-10-19 | 2 | -268/+268 |
| | | | | | | | | | endings from previous commit. | ||||
| * | | Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge | Melanie | 2011-10-25 | 2 | -328/+300 |
| |\ \ | |/ | |||||
| | * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵ | Dan Lake | 2011-10-19 | 2 | -328/+300 |
| | | | | | | | | | scene presence by client ID. | ||||
| * | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+1 |
| |\ \ | |/ | |||||
| | * | factor common code out into SOP.RemoveFromPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+1 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+8 |
| |\ \ | |/ | |||||
| | * | Start recording object updates per second statistic (analogue of agent ↵ | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -0/+8 |
| | | | | | | | | | | | | | updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor A useful diagnostic to find out how object updates are burdening a scene | ||||
| * | | Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | meaningless change to goose panda | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -0/+1 |
| | | | |||||
| * | | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+3 |
| |\ \ | |/ | |||||
| | * | Allow monitoring of stats by region name | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -0/+3 |
| | | | |||||
| * | | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge | Melanie | 2011-10-12 | 15 | -20/+325 |
| |\ \ | |/ | |||||
| | * | Add other region stats (total frame time, physics fps, etc.) currently ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 15 | -20/+325 |
| | | | | | | | | | | | | | | | missing from MonitorModule Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful. This doesn't affect an of the existing monitored stats. | ||||
| * | | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -15/+35 |
| |\ \ | |/ | |||||
| | * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -15/+35 |
| | | | | | | | | | Default is currently on since this is the historical setting | ||||
| * | | Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+4 |
| |\ \ | |/ | |||||
| | * | remove unused LastAssetID from DynamicTextureUpdaer | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -6/+4 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 1 | -1/+1 |
| | |\ | |||||
| * | \ | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists. | ||||
| * | | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | remove the pointless slashes on the end of the (5!) different server stat ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path. | ||||
| * | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+6 |
| |\ \ | |/ | |||||
| | * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵ | Dan Lake | 2011-10-06 | 1 | -6/+6 |
| | | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit(). | ||||
| * | | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge | Melanie | 2011-10-12 | 1 | -21/+4 |
| |\ \ | |/ | |||||
| | * | Removed redundant scene presence lookups in HGMessageTransferModule | Dan Lake | 2011-10-05 | 1 | -21/+4 |
| | | | |||||
| * | | Fix rezzing coalesced object broken by core merge | Melanie | 2011-10-12 | 1 | -54/+36 |
| | | | |||||
| * | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 2 | -399/+398 |
| |\ \ | |/ | | | | | | | | | 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 | 2 | -361/+375 |
| | | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections | ||||
| * | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 2 | -95/+73 |
| |\ \ | |/ | | | | | | | | | 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 | 2 | -95/+73 |
| | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | ||||
| * | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+3 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | ||||
| | * | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -5/+4 |
| | | | |||||
| * | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 1 | -8/+5 |
| |\ \ | |/ | |||||
| | * | minor: remove clutter null check from pass in config to ↵ | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -8/+5 |
| | | | | | | | | | | | | | AvatarFactoryModule.Initialize() This is never null | ||||
| * | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 2 | -5/+54 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | ||||
| | * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -4/+53 |
| | | | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |