Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do a proper null check to avoid the overloaded operator == trap | Melanie | 2012-08-15 | 1 | -1/+1 |
| | |||||
* | Add a real_id field to the login response if impersonation is used. The wrapper | Melanie | 2012-08-15 | 9 | -6/+64 |
| | | | | script needs this for proper logging. | ||||
* | Implementing PRIM_LINK_TARGET in a non-recursive fashion | SignpostMarv | 2012-08-15 | 2 | -117/+107 |
| | |||||
* | Merge branch 'master' into careminster | Melanie | 2012-08-15 | 0 | -0/+0 |
|\ | |||||
| * | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 2 | -34/+77 |
| | | | | | | | | permissions and add support for this (incomplete!) to LSL | ||||
| * | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 2 | -0/+62 |
| | | |||||
| * | Fix and finish the extra parameters storage system for MySQL | Melanie | 2012-08-15 | 1 | -1/+57 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-15 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MSSQL/MSSQLSimulationData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/Null/NullSimulationData.cs OpenSim/Data/SQLite/SQLiteSimulationData.cs OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | ||||
| * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 10 | -0/+113 |
| | | |||||
| * | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 |
| | | |||||
| * | Allow the use of the region debug console found in recent viewers. This console | Melanie | 2012-08-14 | 6 | -3/+60 |
| | | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console. | ||||
| * | minor: Add Gryc Ueusp to CREDITS for commit 884edac amongst others, by request. | Justin Clark-Casey (justincc) | 2012-08-14 | 1 | -0/+1 |
| | | |||||
* | | Let the temp attachment module add a command to allow attaching without ↵ | Melanie | 2012-08-15 | 2 | -32/+60 |
| | | | | | | | | permissions and add support for this (incomplete!) to LSL | ||||
* | | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 2 | -0/+62 |
| | | |||||
* | | Fix and finish the extra parameters storage system for MySQL | Melanie | 2012-08-15 | 1 | -1/+57 |
| | | |||||
* | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 10 | -0/+116 |
| | | |||||
* | | Remove NPC debug spam | Melanie | 2012-08-14 | 1 | -7/+7 |
| | | |||||
* | | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 |
| | | |||||
* | | Allow the use of the region debug console found in recent viewers. This console | Melanie | 2012-08-14 | 6 | -3/+60 |
| | | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console. | ||||
* | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-08-14 | 3 | -46/+85 |
|\ \ | | | | | | | | | | avination | ||||
| * \ | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 3 | -46/+85 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 2 | -38/+49 |
| | |\ \ | | | |/ | |||||
| | | * | Prevent race conditions when one thread removes an NPC SP before another ↵ | Justin Clark-Casey (justincc) | 2012-08-14 | 2 | -39/+50 |
| | | | | | | | | | | | | | | | | thread has retreived it after checking whether the NPC exists. | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -8/+36 |
| | |\ \ | | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | ||||
| | | * | Perform ownership transfer and permission propagation as well as needed | Melanie | 2012-08-14 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | updates on the new temp attachment. | ||||
| | | * | Move inititalization to RegionLoaded to avoid a module loading order issue | Melanie | 2012-08-14 | 1 | -8/+8 |
| | | | | |||||
* | | | | Removed more spammy NPC crap | Melanie | 2012-08-14 | 1 | -1/+1 |
|/ / / | |||||
* | | | Comment spammy debug | Melanie | 2012-08-14 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 29 | -431/+871 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 7 | -20/+168 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Implement the temp attachments. UNTESTED | Melanie | 2012-08-14 | 1 | -0/+44 |
| | | | |||||
| | * | As per lindn spec, disable detach and drop for temp attachments | Melanie | 2012-08-14 | 1 | -0/+8 |
| | | | |||||
| | * | Add the skeleton for the temp attachments module | Melanie | 2012-08-14 | 1 | -0/+82 |
| | | | |||||
| | * | Exclude temp attachemnts from being sent to the avatar service | Melanie | 2012-08-14 | 1 | -1/+2 |
| | | | |||||
| | * | Lay some groundwork for temp attachments. Decouple attachments from inventory. | Melanie | 2012-08-14 | 5 | -20/+33 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-13 | 1 | -6/+68 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | attempt at replicating behaviour of llList2thing functions in SL | SignpostMarv | 2012-08-13 | 1 | -7/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | Committed with changes. Please don't sign comments with your name. Please don't use your own coding style, use the OpenSim project style. Please don't modify unrelated whitespace. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-11 | 13 | -286/+378 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'bulletsim7' | Robert Adams | 2012-08-10 | 9 | -286/+378 |
| | |\ | |||||
| | | * | BulletSim: many, many detailed logging messages for physical linkset | Robert Adams | 2012-08-10 | 7 | -44/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging. Linkset bugs fixed where accounting of children would get lost. Moved scene based vehicle tracking logic from prim to the scene. Added GetCollisionFlags2 method to BulletSimAPI. Updated DLLs and SOs. | ||||
| | | * | BulletSim: Add module names to DetailLog output. Fix some problems with ↵ | Robert Adams | 2012-08-10 | 3 | -63/+71 |
| | | | | | | | | | | | | | | | | linksets that were caused by checking data structures that are changed regularly from taint time code -- resulted in linksets not being unlinked properly. | ||||
| | | * | BulletSim: add an identifier to the TaintObject call so exceptions that ↵ | Robert Adams | 2012-08-09 | 4 | -52/+57 |
| | | | | | | | | | | | | | | | | happen when the taint is invoked can be debugged | ||||
| | | * | BulletSim: separate out the constraints by type. The linksets use | Robert Adams | 2012-08-09 | 6 | -94/+146 |
| | | | | | | | | | | | | | | | | | | | | | | | | 6dof constraint but eventually others will be exposed so future features can use all the Bullet capabilities. Force children to generate a position update when unlinked. | ||||
| | | * | BulletSim: add avatar code to keep avatars from ending up trapped under the ↵ | Robert Adams | 2012-08-08 | 5 | -54/+47 |
| | | | | | | | | | | | | | | | | terrain | ||||
| | * | | BulletSim: actually update the DLLs and SOs | Robert Adams | 2012-08-10 | 4 | -0/+0 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-09 | 8 | -14/+47 |
| |\ \ | | |/ | |||||
| | * | BulletSim: Added avatar capsule scaling for size of avatar. | Robert Adams | 2012-08-07 | 8 | -14/+47 |
| | | | | | | | | | | | | | | | | | | | | | | | | This also fixes computation of avatar mass. Added parameter MaxPersistantManifoldPoolSize. Fixed a parameter setting bug which caused crashes of there were more than 400 or so physical objects. I tested up to 5000. Updated BulletSim DLLs and SOs. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-07 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | Release http-in URLs when llResetScript is called | Melanie | 2012-08-07 | 1 | -0/+6 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-07 | 6 | -4/+7 |
| |\ \ | | |/ |