Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 3 | -12/+42 |
|\ | |||||
| * | Fix incorrect class name | Melanie | 2010-10-06 | 1 | -1/+1 |
| | | |||||
| * | Convert the map image modules to new style modules | Melanie | 2010-10-06 | 3 | -12/+42 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 5 | -10/+26 |
|\ \ | |/ | |||||
| * | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 1 | -0/+5 |
| | | |||||
| * | Revert an accidental default value change | Melanie | 2010-10-05 | 1 | -1/+1 |
| | | |||||
| * | Patch to allow other cam angles. Not complete. Thanks, Antont. | Melanie | 2010-10-05 | 1 | -4/+14 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-05 | 2 | -7/+7 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 2 | -7/+7 |
| | | | |||||
| * | | Make windlight set the default environment on start | BlueWall | 2010-10-05 | 1 | -0/+1 |
| |/ | |||||
| * | Avoid throwing errors when adding existing meshes to the render scene | Latif Khalifa | 2010-10-04 | 1 | -0/+6 |
| | | |||||
* | | Avoid throwing errors when adding existing meshes to the render scene | Latif Khalifa | 2010-10-04 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -5/+17 |
|\ \ | |/ | |||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -5/+17 |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
| * | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 2 | -4/+4 |
| | | |||||
* | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 2 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 11 | -68/+1448 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-03 | 1 | -21/+34 |
| |\ | |||||
| | * | Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker. | Diva Canto | 2010-10-02 | 1 | -21/+34 |
| | | | |||||
| * | | Adapt to core changes | Melanie | 2010-10-03 | 1 | -1/+1 |
| | | | |||||
| * | | Addign the new / renamed files for previous commit | Melanie | 2010-10-03 | 8 | -0/+2655 |
| | | | |||||
| * | | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 6 | -1290/+2 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -12/+0 |
|\ \ | |/ | |||||
| * | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -1/+1 |
| | | | | | | | | original patch | ||||
| * | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -13/+1 |
| | | | | | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 5 | -16/+26 |
|\ \ | |/ | |||||
| * | Prevent dropping someone else's attachments | Melanie | 2010-09-30 | 1 | -0/+3 |
| | | |||||
| * | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -1/+13 |
| | | |||||
| * | Cleanup: Removed an unreferenced variable from ActivityDetector.cs | John Hurliman | 2010-09-29 | 1 | -11/+1 |
| | | |||||
| * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 3 | -5/+5 |
| | | | | | | | | flexible without changing current behavior | ||||
| * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 3 | -6/+11 |
| | | | | | | | | possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Restrict top colliders / top scripts to estate managers | Melanie | 2010-09-27 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Quash the region ID on intersim messages. That prevents people from determining | Melanie | 2010-09-27 | 1 | -1/+1 |
| | | | | | | | | another avatars location | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 4 | -9/+11 |
|\ \ | |/ | |||||
| * | When receiving intersim IM, don't let the spoof protection bomb | Melanie | 2010-09-26 | 1 | -1/+2 |
| | | |||||
| * | Consistency patch: use Path.Combine() instead of + and eliminate the need | Melanie | 2010-09-26 | 3 | -8/+9 |
| | | | | | | | | for a trailing slash on exports/ | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Prevent spoofing the agent name on text IM | Melanie | 2010-09-25 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+4 |
|\ \ | |/ | |||||
| * | Fix a minor economy issue | Melanie | 2010-09-25 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 2 | -9/+25 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-21 | 1 | -3/+1 |
| |\ | |||||
| | * | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -3/+1 |
| | | | | | | | | | | | | This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars | ||||
| * | | Fix a typo | Melanie | 2010-09-21 | 1 | -3/+3 |
| | | | |||||
| * | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -5/+23 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 5 | -30/+10 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 2 | -33/+83 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 5 | -29/+8 |
| | | | | | | | | MapAndArray collection |