aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-06-234-7/+14
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| |
| * Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
| |
| * Forward the reason to the scriptMelanie2013-06-131-1/+1
| |
| * Add a result param to te money module interfaceMelanie2013-06-133-4/+7
| |
| * * This fixes having to select and deselect prim to get keyframemotion to ↵Melanie2013-06-133-2/+8
| | | | | | | | | | | | | | | | start running when pulled from data storage. Conflicts: OpenSim/Data/SQLite/SQLiteSimulationData.cs
* | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \
| * | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-1812-61/+200
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * | correct method doc for llRot2Axis()dahlia2013-06-141-1/+1
| | |
| * | Lock m_classifiedCache and m_classifiedInterest dictionary reads in ↵Justin Clark-Casey (justincc)2013-06-151-14/+13
| | | | | | | | | | | | | | | | | | UserProfileModule since in the presence of writes these are not thread-safe operations. Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
| * | Correct build break in previous commit 9c530d7Justin Clark-Casey (justincc)2013-06-151-10/+7
| | |
| * | refactor: In UserProfileModule, change classifiedCache and ↵Justin Clark-Casey (justincc)2013-06-151-19/+23
| | | | | | | | | | | | | | | | | | classifiedInterest to m_classifiedCache and m_classifiedInterest This is the coding standard name style for private fields.
| * | Add the standard OpenSimulator copyright notice to the top of InventoryCache.csJustin Clark-Casey (justincc)2013-06-151-1/+28
| | |
| * | Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache ↵Justin Clark-Casey (justincc)2013-06-151-14/+23
| | | | | | | | | | | | isn't needed since it's thread safe but r/w of contained dictionaries isn't thread-safe
| * | minor: remove mono compiler warnings from LSL_Api, properly format method ↵Justin Clark-Casey (justincc)2013-06-151-7/+5
| | | | | | | | | | | | doc for llRot2Axis()
| * | Mantis 6280: llSetContentType(). An implementation.Talun2013-06-154-0/+84
| | | | | | | | | | | | | | | An implimentation of llSetContentType including all of the new constants added since the mantis was raised.
| * | Mantis 6108: ossetprimitiveparams temporary/phantom problemTalun2013-06-151-2/+2
| | | | | | | | | | | | | | | | | | Corrected to ensure that the target prim is updated by osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM instead of the prim that the script is in.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-147-10/+37
| |\ \
| | * \ Merge branch 'master' of /home/opensim/src/opensimBlueWall2013-06-135-2/+29
| | |\ \
| | | * | Add Option: ClassifiedFeeBlueWall2013-06-135-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to set minimum fee for publishing classifieds. Many viewers have a hard coded minimum of 50, which makes publishing classifieds fail where grids have no economy. This allows the grid to set the minimum fee to a suitable value for their operation. The option is located in the [LoginService] section and defaults to 0. The value is sent as "classified_fee" in the login response.
| * | | | Don't try to abort worker threads in WebFetchInvDescModule if module was not ↵Justin Clark-Casey (justincc)2013-06-141-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. This also moves the abort to RemoveRegion() rather than a destructor.
* | | | | Merge branch 'master' into careminsterMelanie2013-06-1318-181/+286
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-1215-122/+227
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-133-4/+8
| | |\ \ \
| | | * | | * This fixes having to select and deselect prim to get keyframemotion to ↵teravus2013-06-123-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | start running when pulled from data storage.
| | * | | | Make XInventoryServicesConnector properly handle a RESULT = false return for ↵Justin Clark-Casey (justincc)2013-06-131-68/+56
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | methods where this contains failure rather than throwing an exception. Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
| | * | | After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, ↵Justin Clark-Casey (justincc)2013-06-122-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistently check for null return and log warning rather than throw exception. This was being done already in some places. If an exception is thrown it is now an error rather than debug
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-126-20/+41
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-06-112-14/+30
| | | |\ \
| | | | * | BulletSim: when meshing or asset fetching fails, include positionRobert Adams2013-06-112-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | and region with the offending object's name in the error message.
| | | * | | Revert "Add option to set minimum fee for classified ads"BlueWall2013-06-113-16/+1
| | | |/ / | | | | | | | | | | | | | | | This reverts commit 90097de6c3cf58989698b37c89baa8268895fc86.
| | | * | Merge working repoBlueWall2013-06-113-1/+16
| | | |\ \
| | | | * | Add option to set minimum fee for classified adsBlueWall2013-06-113-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upcoming phoenix-firestorm (4.4.1) adds a configurable option for setting the minimum price for publishing a classified ad. http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/43415d69b048
| | | * | | Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-114-6/+11
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString().
| | * | | Implement logging of first 80 characters (debug level 5) or full body data ↵Justin Clark-Casey (justincc)2013-06-122-5/+57
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | (debug level 6) on outgoing requests, depending on debug level This is set via "debug http out <level>" This matches the existing debug level behaviours for logging incoming http data
| | * | Uncomment Mic's code and split to create new regression ↵Justin Clark-Casey (justincc)2013-06-111-23/+41
| | | | | | | | | | | | | | | | TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
| * | | DataSnapshot: changed those annoying messages to Debug instead of Info.Diva Canto2013-06-122-8/+8
| |/ /
| * | Removed the lock entirelyDiva Canto2013-06-111-56/+52
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-1113-74/+153
| |\ \
| * | | Really bad idea to lock m_UserCache for so long in UserManagementModule. ↵Diva Canto2013-06-111-13/+17
| | | | | | | | | | | | | | | | Added a special lock object instead, if we really want to avoid concurrent executions of that code.
* | | | Merge branch 'master' into careminsterMelanie2013-06-110-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| | | | | | | | | | | | | | | | right corner.
* | | | Merge branch 'avination-current' into careminsterMelanie2013-06-115-332/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Put the "script saved" and "notecard saved" messages back into the bottomMelanie2013-06-111-2/+2
| | | | | | | | | | | | | | | | right corner.
| * | | Explicitly set uploaded mesh object permsMelanie2013-06-101-10/+13
| | | |
| * | | Make objects attached from the ground appear in inventory again. Fixes a numberMelanie2013-06-081-1/+1
| | | | | | | | | | | | | | | | of interaction issues causing client crashes.
| * | | Clean up poll serviceMelanie2013-06-072-319/+0
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-06-115-15/+43
|\ \ \ \ | | |/ / | |/| |
| * | | * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵teravus2013-06-113-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active.
generated by cgit v1.1 at 2024-12-15 18:28:38 +0000