| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| * | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+6 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | ||||
| | * | Added a setting to [Startup] section of config that will allow the simulator ↵ | Kevin Houlihan & Michelle Argus | 2011-09-24 | 1 | -3/+6 |
| | | | | | | | | | | | | | to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region. | ||||
| * | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | in via hypergrid. If a user account isn't available, this just passes on the name given by the agent instead. I'm not sure this is particularly useful since I believe that agent names could be faked in this context - it might be no more useful than a viewer agent string. In fact, there might even be an argument that passing on this name provides a false expectation of authenticity. However, I will apply for now. Patch applied from http://opensimulator.org/mantis/view.php?id=5696 Thanks Michelle Argus. | ||||
| * | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 4 | -102/+253 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | ||||
| | * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 4 | -86/+253 |
| | | | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made. | ||||
| * | | Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge | Melanie | 2011-10-11 | 2 | -9/+18 |
| |\ \ | |/ | |||||
| | * | Fix failure to teleport when an agent is lured on the same sim (and probably ↵ | Justin Clark-Casey (justincc) | 2011-09-22 | 2 | -9/+18 |
| | | | | | | | | | | | | | | | | | | | in neighbouring sims) with HG lure active It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar. However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour. We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690 | ||||
| * | | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+3 |
| |\ \ | |/ | |||||
| | * | On setting a new avatar appearance, if height hasn't changed then don't set ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | that same height in ScenePresence. This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself | ||||
| * | | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
| |\ \ | |/ | |||||
| | * | refactor: move estate owner setup code into separate method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+2 |
| | | | |||||
| * | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -10/+14 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs | ||||
| | * | Correctly create a freshly created estate owner's default items and avatar ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -11/+15 |
| | | | | | | | | | entries on standalone if applicable. | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |