Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-05-07 | 7 | -40/+88 | |
| |\ \ \ | ||||||
| * | | | | Fix Mouse+WASD makes Av rise; Fix PREJUMP. | Kitto Flora | 2010-05-07 | 4 | -28/+40 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 14 | -143/+719 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete ↵ | Diva Canto | 2010-05-07 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | fields. | |||||
| * | | | | These files are part of the GridUserService write-up. | Diva Canto | 2010-05-07 | 2 | -0/+269 | |
| | | | | | ||||||
| * | | | | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 12 | -3156/+3204 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | |||||
| * | | | | improve handling of undersize sculpt textures | dahlia | 2010-05-06 | 1 | -4/+11 | |
| | | | | | ||||||
| * | | | | corrections for face numbering and uv mapping, mostly for spheres - sync ↵ | dahlia | 2010-05-06 | 1 | -2201/+2284 | |
| | | | | | | | | | | | | | | | | | | | | with PrimMesher r56 | |||||
| * | | | | Sculpt meshing refactoring - improves mesh accuracy and UV mapping | dahlia | 2010-05-06 | 2 | -639/+810 | |
| | | | | | | | | | | | | | | | | | | | | Sync with PrimMesher r55 | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-07 | 1 | -0/+2 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Also remove sale and search flags on god owner change. | Melanie | 2010-05-07 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Remove land that is being abandoned from search. This is now consistent with | Melanie | 2010-05-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | sale and reclaim. | |||||
| * | | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-06 | 5 | -206/+436 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" Causes an exception within HttpServer, headers have already been sent. This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc. | |||||
* | | | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-06 | 5 | -206/+436 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" Causes an exception within HttpServer, headers have already been sent. This reverts commit 8187fccd258bf0936d3db8663844e07a7b81e9fc. | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-06 | 7 | -110/+138 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-06 | 2 | -3/+18 | |
| |\ \ \ \ | ||||||
| | * | | | | * Fixes Library bugs in grid mode. Partly a missing check and partly a ↵ | Diva Canto | 2010-05-05 | 2 | -3/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing configuration. * Made previous Robust config changes consistent in Robust.HG.ini.example | |||||
| * | | | | | Ensure the show in search flag is cleared on ownership change. Also, when | Melanie | 2010-05-06 | 2 | -1/+8 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | land is reclaimed, reset it's for sale flags so it can't be bought again right away. | |||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-05 | 3 | -106/+112 | |
| |\ \ \ \ | ||||||
| | * | | | | Added copying of Viewer field to the agent circuit data that is being passed ↵ | Diva Canto | 2010-05-05 | 3 | -106/+112 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TPs and crossings. (XmlRpcGroups files want to be committed too) | |||||
| * | | | | | Remove the m_Viewer variable and make the property a shortcut to the | Melanie Thielker | 2010-05-05 | 2 | -7/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | proper field in AgentCircuitData instead | |||||
* | | | | | Remove the m_Viewer variable and make the property a shortcut to the | Melanie Thielker | 2010-05-06 | 2 | -7/+1 | |
| | | | | | | | | | | | | | | | | | | | | proper field in AgentCircuitData instead | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-05 | 6 | -543/+315 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Stab a test fail | Melanie | 2010-05-05 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | Plumb Viewer version into ScenePresence for initial login. It's still not | Melanie Thielker | 2010-05-05 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | carried along | |||||
| * | | | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-05 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | |||||
| * | | | | Removed a test for a "can't happen" case. ParentGroup is never null anymore. | Melanie Thielker | 2010-05-05 | 1 | -9/+1 | |
| | | | | | ||||||
| * | | | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups | Melanie | 2010-05-05 | 5 | -542/+312 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | | Add perms check to the teleport home client command handlers. | Melanie Thielker | 2010-05-04 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | Strip estate message sending out from the estate management module and | Melanie Thielker | 2010-05-04 | 4 | -25/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dialog module. Convert it to an event on the estate module interface. The old implementation did the same as message to region, a button that is right next to it on the UI. This implementation prevented people from adding a more sane one in a module. | |||||
| * | | | | make the events more useful by providing the source region | Melanie Thielker | 2010-05-04 | 2 | -3/+3 | |
| | | | | | ||||||
* | | | | | Plumb Viewer version into ScenePresence for initial login. It's still not | Melanie Thielker | 2010-05-06 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | carried along | |||||
* | | | | | Plumb the viewer version string through into AgentCircuitData. Now all that | Melanie Thielker | 2010-05-06 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data. | |||||
* | | | | | Removed a test for a "can't happen" case. ParentGroup is never null anymore. | Melanie Thielker | 2010-05-05 | 1 | -9/+1 | |
| | | | | | ||||||
* | | | | | Add perms check to the teleport home client command handlers. | Melanie Thielker | 2010-05-05 | 1 | -0/+6 | |
| | | | | | ||||||
* | | | | | Strip estate message sending out from the estate management module and | Melanie Thielker | 2010-05-04 | 4 | -25/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dialog module. Convert it to an event on the estate module interface. The old implementation did the same as message to region, a button that is right next to it on the UI. This implementation prevented people from adding a more sane one in a module. | |||||
* | | | | | make the events more useful by providing the source region | Melanie Thielker | 2010-05-04 | 2 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-04 | 1 | -0/+3 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | sacha | 2010-05-02 | 6 | -40/+85 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 | |
| | | | | | | ||||||
| | * | | | | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Adding DebugEvent Trap | sacha | 2010-05-02 | 1 | -0/+3 | |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding XMREEvent Trap trapDebug("Modulename" ,"My data here ", scene); trapXMRE(int data, string Message, Scene scene); | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-04 | 2 | -1/+6 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Add events to the estate interface to let interested modules know of | Melanie Thielker | 2010-05-04 | 2 | -0/+41 | |
| | | | | | | | | | | | | | | | | | | | | changes to estate settings | |||||
| * | | | | Add "reload estate" command to sims | Melanie Thielker | 2010-05-04 | 1 | -0/+14 | |
| | | | | | ||||||
| * | | | | Allow reloading of estate settings into a running region. Move sun update | Melanie Thielker | 2010-05-04 | 2 | -37/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | helper into Scene, since that is less evil than exposing m_storageManager to the public. | |||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-03 | 2 | -1/+6 | |
| |\ \ \ \ | ||||||
| | * | | | | Assorted bug fixes in hypergrid linking. | Diva Canto | 2010-05-03 | 2 | -1/+6 | |
| | | | | | | ||||||
| * | | | | | Store given items in correct parent folder. Fixes items given to offline avatars | Melanie Thielker | 2010-05-03 | 1 | -0/+19 | |
| |/ / / / | | | | | | | | | | | | | | | | not getting lost. | |||||
| * | | | | Fix a bug in owner change notification | Melanie | 2010-05-03 | 1 | -1/+3 | |
| | | | | |