Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 1 | -6/+51 |
|\ | |||||
| * | Adding osFunctions for light projection | BlueWall | 2010-10-17 | 1 | -5/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the projection parameters in the host prim ... osSetProjectionParam(bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Set the projection parameters in a target prim ... osSetProjectionParam(ikey target uuid, bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Threat Level very high Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Add missing check for !_projectionEntry | BlueWall | 2010-10-16 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 4 | -4/+99 |
|\ \ | |/ | |||||
| * | Adding projected light filters to prim propeties | BlueWall | 2010-10-15 | 1 | -0/+80 |
| | | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | * Tweaked the upload response and now at least uploading the mesh works. | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -0/+14 |
| | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working. | ||||
| * | Kill some magic numbers in the caps module | Melanie | 2010-10-14 | 1 | -3/+3 |
| | | |||||
| * | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
* | | Add a setter to OldItemID so it can be deserialized | Melanie | 2010-10-13 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 2 | -17/+21 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-10-09 | 1 | -4/+4 |
| | | |||||
| * | Limit formatting of local console output to actual logging messages. | Marck | 2010-10-09 | 1 | -13/+17 |
| | | | | | | | | | | The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level. This fixes the issue of colons being added to help texts on the local console. | ||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -1/+1 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -1/+36 |
|\ \ | |/ | |||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -1/+36 |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -0/+11 |
|\ \ | |/ | |||||
| * | Port ExecutingDirectory from omfOS Util class. | Melanie | 2010-10-03 | 1 | -0/+11 |
| | | |||||
* | | When clearing the addin registry, respect a custom path | Melanie | 2010-09-24 | 1 | -4/+13 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-09-21 | 1 | -5/+3 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix a merge artefact that broke script state persistence in XAttachments | Melanie | 2010-09-19 | 1 | -5/+3 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 8 | -19/+484 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | * Tweaked the LocationTests for maximum coverage. | Teravus Ovares (Dan Olivares) | 2010-09-18 | 2 | -1/+60 |
| | | | | | | | | * Added more mundane tests. | ||||
| * | * Covered the type converters in SLUtil with unit tests. | Teravus Ovares (Dan Olivares) | 2010-09-18 | 1 | -1/+57 |
| | | | | | | | | * Does anyone have an example raw notecard to look at and test the notecard parser? | ||||
| * | * More Mundane Tests | Teravus Ovares (Dan Olivares) | 2010-09-17 | 2 | -0/+198 |
| | | | | | | | | * SL Util tests of AssetType2ContentType and ContentType2AssetType | ||||
| * | REST Console delivers responses with content type text/xml instead of ↵ | Marck | 2010-09-18 | 1 | -2/+2 |
| | | | | | | | | | | | | text/plain. Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload. | ||||
| * | Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -2/+3 |
| | | | | | | | | Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe | ||||
| * | Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to ↵ | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -0/+0 |
| | | | | | | | | | | | | OpenSim/Framework/Tests/PrimeNumberHelperTests.cs I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't | ||||
| * | * Fixed and re-enabled CacheTests | Teravus Ovares (Dan Olivares) | 2010-09-17 | 3 | -15/+166 |
| | | | | | | | | | | * Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework. * Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 2 | -0/+242 |
|\ \ | |/ | |||||
| * | * Add a few more tests to help our meager code coverage %. | Teravus Ovares (Dan Olivares) | 2010-09-17 | 2 | -0/+242 |
| | | | | | | | | | | | | * Tests Animation Constructors * Tests Animation OSD Packing/Unpacking * Tests the PrimeNumberHelper class which is used in the cache. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -0/+188 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -0/+188 |
| | | | | | | | | MapAndArray collection | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -46/+0 |
|\ \ | |/ | |||||
| * | Remove long unused Region/Framework/ThreadTracker | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -46/+0 |
| | | | | | | | | All methods had already been deleted, only GetThreads() was left | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 2 | -18/+22 |
|\ \ | |/ | |||||
| * | Fix "show threads" to show threads now being managed by ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 2 | -18/+22 |
| | | | | | | | | OpenSim.Framework.Watchdog | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 16 | -187/+245 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Merged | John Hurliman | 2010-09-12 | 11 | -157/+181 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 9 | -155/+152 |
| | | | |||||
| | * | Add copyright headers. | Jeff Ames | 2010-09-12 | 2 | -2/+29 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 1 | -16/+0 |
| |/ | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings | ||||
| * | Made it impossible to create a user with names containing spaces and ↵ | randomhuman | 2010-09-10 | 2 | -2/+54 |
| | | | | | | | | prevented passwords from being echoed after enter is pressed. | ||||
| * | Remove parenthesis around the release flavour to get the version string back ↵ | Justin Clark-Casey (justincc) | 2010-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | under 27 chars Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-08 | 1 | -6/+4 |
| |\ | |||||
| | * | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache | ||||
| * | | If a scene object part UUID is changed (only possible when not in a scene), ↵ | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -5/+5 |
| |/ | | | | | | | then adjust the inventory items to point to the new uuid as well | ||||
| * | Fix build break | Melanie | 2010-09-05 | 1 | -4/+0 |
| | | |||||
* | | Revert "Workaround for mono bug #312968" | Melanie Thielker | 2010-09-06 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead. | ||||
* | | Workaround for mono bug #312968 | Melanie Thielker | 2010-09-06 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 3 | -5/+56 |
|\ \ | |/ |