Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'os/master' | UbitUmarov | 2015-09-01 | 2291 | -0/+638148 |
|\ | |||||
| * | Mantis #7713: fixed bug introduced by 1st MOSES patch. | Diva Canto | 2015-08-30 | 1 | -7/+9 |
| | | |||||
| * | Restore FlotsamAssetCache as default and pre-enabled asset cache module | Ai Austin | 2015-08-26 | 1 | -5/+5 |
| | | | | | | | | | | | | | | Keep FlotsamAssetCache as default and pre-enabled asset cache module in StandaloneCommon.ini./example to have common behaviour between grids and standalones. Asset cache is needed to better support temporary assets and texture drawing functions. | ||||
| * | Still about Ai's patch: it turns out OpenSim doesn't work well without an ↵ | Diva Canto | 2015-08-25 | 1 | -2/+2 |
| | | | | | | | | asset cache because of temporary assets. So setting the default asset cache to Cenome, which is the in-memory cache. | ||||
| * | Fixed comment in ini related to previous patch | Diva Canto | 2015-08-25 | 1 | -1/+1 |
| | | |||||
| * | Changes to .ini.example files to improve instructions and workflow for ↵ | Ai Austin | 2015-08-25 | 2 | -20/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | standalone setups Clarify what must be changed in initial .ini files to create a working standalone setup now that [Const] variables are used. Fix separator used in one of choice lists for [Const] BaseURL descriptor. Minor changes to line spacing of some sections in StandaloneCommon.ini.example file for layout regularity. Correction of a typo in comment. Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| * | Revert "BulletSim: delay adding a scene presence to the list of presences" | Robert Adams | 2015-08-24 | 3 | -33/+19 |
| | | | | | | | | | | | | Remove these changes until the region crossing problems can be figured out. This reverts commit 062ec0efbda0e4ca6df5541039569e023d0d0e79. | ||||
| * | BulletSim: delay adding a scene presence to the list of presences | Robert Adams | 2015-08-23 | 3 | -19/+33 |
| | | | | | | | | | | until it is fully configured. Another addition to fixing the collisions stopping problem. | ||||
| * | In ScenePresence, when removing from the physical scene, unsubscribe | Robert Adams | 2015-08-23 | 1 | -1/+1 |
| | | | | | | | | | | from collisions before removing the collision callbacks. Should not make operational differences. | ||||
| * | Add Culture.FormatProvider to String.Format, like it is done for LSLFloat | lillith xue | 2015-08-24 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
| * | Revert "update libomv managed dlls to 49a5cf05c32e - fresh clone default ↵ | dahlia | 2015-08-23 | 5 | -184/+119 |
| | | | | | | | | | | | | settings release mode VS 2015 community edition" This reverts commit 4f8e18e31c75c31c833833ca7582938b1bb95804. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2015-08-23 | 1 | -62/+62 |
| |\ | |||||
| | * | Just replace all m_data accesses with accesses to Data, which is | Melanie Thielker | 2015-08-24 | 1 | -62/+62 |
| | | | | | | | | | | | | protected against nullrefs | ||||
| * | | update libomv managed dlls to 49a5cf05c32e - fresh clone default settings ↵ | dahlia | 2015-08-23 | 5 | -119/+184 |
| |/ | | | | | | | release mode VS 2015 community edition | ||||
| * | Revert "Revert "Fix a possible nullref caused by accessing m_data rather ↵ | Melanie Thielker | 2015-08-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | than Data"" Needed after all This reverts commit 26094c21feb8f63d7e6ed46ec2668f213d9dc623. | ||||
| * | Fix the nullref in scripts - the right way | Melanie Thielker | 2015-08-23 | 1 | -3/+3 |
| | | |||||
| * | Revert "Fix a possible nullref caused by accessing m_data rather than Data" | Melanie Thielker | 2015-08-23 | 1 | -4/+4 |
| | | | | | | | | | | | | My bad! This reverts commit 20326e1947f56c6c39a9e701859c286ebee062e0. | ||||
| * | Refine comments .ini file setup for new Standalone | Ai Austin | 2015-08-21 | 2 | -2/+7 |
| | | | | | | | | | | | | | | Helpful comment for setting [const] section of OpenSim.ini to allow for standalone. Correction to StandaloneCommon.ini.example as [GridInfoServices] welcome parameter does work and is also useful for standalones. | ||||
| * | More plumbing on agent states | Melanie Thielker | 2015-08-20 | 2 | -0/+17 |
| | | |||||
| * | Fix multiple moving_end and add moving_start to llSetKeyframedMotion | Jeff Kelley | 2015-08-20 | 1 | -10/+15 |
| | | | | | | | | Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
| * | Partial plumbing for the agent stateful module features negotiation | Melanie Thielker | 2015-08-20 | 10 | -14/+41 |
| | | |||||
| * | Merge branch 'master' of opensimulator.org:/var/git/opensim | Melanie Thielker | 2015-08-19 | 2 | -2/+2 |
| |\ | |||||
| | * | Add explicit initialization because mono 3 doesn't like what mono 2 allows | Melanie | 2015-08-19 | 2 | -2/+2 |
| | | | |||||
| * | | Fix a possible nullref caused by accessing m_data rather than Data | Melanie Thielker | 2015-08-19 | 1 | -4/+4 |
| |/ | |||||
| * | Convert the lsl list type into a struct. EXPERIMENTAL! This may affect | Melanie Thielker | 2015-08-19 | 4 | -172/+172 |
| | | | | | | | | the llSetPrimitiveParams family of functions adversely. Please test! | ||||
| * | Some unit tests are simply broken and create an API with a null m_item. | Melanie Thielker | 2015-08-19 | 1 | -0/+6 |
| | | | | | | | | | | This isn't supposed to be done and should be changed in the tests. For now, add a protective check. | ||||
| * | Try to address Mantis #7689. When adding a scalar to a list, make a copy | Melanie Thielker | 2015-08-19 | 1 | -2/+5 |
| | | | | | | | | as is done when adding another list. | ||||
| * | Change the IScriptApi back to it's original form, removing XEngine | Melanie Thielker | 2015-08-17 | 22 | -69/+101 |
| | | | | | | | | | | specific additions that should not have been there in the first place. Sleeping and time measurement are now completely internal to XEngine | ||||
| * | Revert "When scripts are sleeping, don't count that as execution time" | Melanie Thielker | 2015-08-17 | 18 | -95/+49 |
| | | | | | | | | | | | | | | The approach is good but the way it is written breaks the architecture. Rewrite follows. This reverts commit a568f06b7faea807149205d0e47454e4883e4836. | ||||
| * | Merge branch 'master' of opensimulator.org:/var/git/opensim | Melanie Thielker | 2015-08-17 | 1 | -15/+15 |
| |\ | |||||
| | * | Minor improvement of previous patch. | Diva Canto | 2015-08-16 | 1 | -6/+10 |
| | | | |||||
| | * | MANTIS-7684 - Use the user management module to get username for script dialogs | Cinder | 2015-08-16 | 1 | -13/+9 |
| | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| * | | Prevent the spammy "many event" message from appearing in normal use. | Melanie Thielker | 2015-08-17 | 1 | -2/+4 |
| |/ | | | | | | | | | | | Console command debug xengine now turns that on. Also, per orenh, remove the triggers at 1000 and 10000 as they are not useful now that top scripts works. | ||||
| * | Make Setup_XXX=disabled not even load the module at all, rather than | Melanie Thielker | 2015-08-16 | 1 | -0/+7 |
| | | | | | | | | loading and not using it | ||||
| * | Create want and need lists for agent data interchange formats. | Melanie Thielker | 2015-08-16 | 1 | -0/+44 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2015-08-15 | 1 | -0/+61 |
| |\ | |||||
| | * | Adding the IAgentStatefulModule interface. It is used in addtion to | Melanie Thielker | 2015-08-15 | 1 | -0/+61 |
| | | | | | | | | | | | | | | | one of the existing module interfaces to denote a module that holds agent specific state that should be transferred to other regions | ||||
| * | | Removed ignoreCase=true from the call to Type.GetInterface, because, well, ↵ | Diva Canto | 2015-08-15 | 4 | -5/+5 |
| |/ | | | | | | | we don't want to ignore case. And this seems to be causing problems in mono 4.3. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2015-08-14 | 5 | -15280/+15283 |
| |\ | |||||
| | * | Only send the requested ObjectPropertiesFamily in the ↵ | Drake Arconis | 2015-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | RequestObjectPropertiesFamily reply and not the actual ObjectProperties packet Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
| | * | Update libomv managed dlls to 49a5cf05c32e | dahlia | 2015-08-14 | 3 | -0/+0 |
| | | | |||||
| | * | Send a proper ownerid for Object messages to conform with what viewer expects | Drake Arconis | 2015-08-15 | 1 | -2/+5 |
| | | | | | | | | | | | | Signed-off-by: Melanie Thielker <melanie@t-data.com> | ||||
| | * | Remove DOS line endings from LSL_API.cs | Melanie Thielker | 2015-08-13 | 1 | -15278/+15278 |
| | | | |||||
| * | | Only send the requested ObjectPropertiesFamily in the ↵ | Drake Arconis | 2015-08-14 | 1 | -1/+1 |
| |/ | | | | | | | | | | | RequestObjectPropertiesFamily reply and not the actual ObjectProperties packet Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| * | Whitespace borkness? | Diva Canto | 2015-08-12 | 1 | -15277/+15277 |
| | | |||||
| * | Send correct uuids in the FromID and ID packet fields for llInstantMessage | Drake Arconis | 2015-08-12 | 1 | -5/+2 |
| | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com> | ||||
| * | Added *.Tests.log to .gitignore | Oren Hurvitz | 2015-08-11 | 1 | -0/+1 |
| | | |||||
| * | When the user stops a script, have it remain stopped | Oren Hurvitz | 2015-08-11 | 3 | -3/+28 |
| | | | | | | | | | | | | Previously the script state was never saved for a !Running script, so upon region restart the script would be Running again. The use of the 'StayStopped' flag is needed because all scripts are automatically stopped when the region shuts down, but in that case we shouldn't save in their state that they're !Running. | ||||
| * | When scripts are sleeping, don't count that as execution time | Oren Hurvitz | 2015-08-11 | 18 | -49/+95 |
| | | | | | | | | Sleeping doesn't use the CPU. | ||||
| * | Show Script Time in the statistics panel | Oren Hurvitz | 2015-08-11 | 3 | -38/+69 |
| | | | | | | | | The value shown is the number of milliseconds per frame that were spent executing scripts in this region. |