| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 17 | -116/+292 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | | | | | terrain save-tile extensions Signed-off-by: Garmin Kawaguichi ↵ | Garmin Kawaguichi | 2012-04-03 | 11 | -3/+74 | |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | <garmin.kawaguichi@magalaxie.com> Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | | | | Fix more SOP.PhysActor race conditions in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-03 | 1 | -7/+19 | |
| | | | | | | | ||||||
| | * | | | | | Eliminate race condition where many callers would check SOP.PhysicsActor != ↵ | Justin Clark-Casey (justincc) | 2012-04-03 | 5 | -154/+208 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it. | |||||
| | * | | | | | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0) | |||||
| * | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-31 | 4 | -17/+90 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | careminster | |||||
| | * | | | | | | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0) | |||||
| | * | | | | | | Cache the last maptile and return the cachrd tile if the last request is | Melanie | 2012-03-29 | 1 | -8/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less than an hour ago. Avoids generating the maptile twice on startup. | |||||
| | * | | | | | | Allow the map tile module to be enabled without also eabling refresh | Melanie | 2012-03-29 | 1 | -8/+11 | |
| | | | | | | | | ||||||
| | * | | | | | | Allow llTeleportAgent to work in attachments | Melanie | 2012-03-29 | 1 | -0/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 20 | -245/+606 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs | |||||
| | * | | | | | refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 7 | -31/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | the 'root' part. | |||||
| | * | | | | | Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 3 | -35/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ContainsPart method and remove method duplication. HasChildPrim is also misleading since the 'root' prim can also be returned. | |||||
| | * | | | | | Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlRegionSayTo Addresses http://opensimulator.org/mantis/view.php?id=5950 | |||||
| | * | | | | | minor: small message adjustment and unnecessary code elimination when ↵ | Justin Clark-Casey (justincc) | 2012-03-31 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | notifying client of no build permission | |||||
| | * | | | | | fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932 | PixelTomsen | 2012-03-31 | 2 | -1/+12 | |
| | | | | | | | ||||||
| | * | | | | | minor: remove some now unneeded code from FriendsCommandsModule | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -55/+0 | |
| | | | | | | | ||||||
| | * | | | | | Make default "show friends" console command show friends fetched from the ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 3 | -8/+86 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | friends service. There is no a --cache option which will show friends from the local cache if available. | |||||
| | * | | | | | refactor: Move "friends show cache" console command out into separate ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 4 | -97/+205 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FriendsCommandsModule. Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation | |||||
| | * | | | | | Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 5 | -64/+102 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc. | |||||
| | * | | | | | refactor: Stop passing both IClientAPI and agentID to friend event ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 4 | -27/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere. | |||||
| | * | | | | | Add simple regression test for logging in with offline friends. Don't ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -1/+46 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | expect to receive any in this instance. | |||||
| | * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -1/+28 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Also add OSS header to interface | Melanie | 2012-03-29 | 1 | -1/+28 | |
| | | | | | | | | ||||||
| | * | | | | | | Add back parts of reverted changes that were not concerned with child agent ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 6 | -6/+14 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents. | |||||
| | * | | | | | Change namespace on CallingCardModule and correct interface file placemant. ↵ | Melanie | 2012-03-29 | 2 | -2/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also ass OpenSource header | |||||
| | * | | | | | Revert "Simplify friends caching by only doing this for root agents - no ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 7 | -29/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a. | |||||
| | * | | | | | Revert "Add comment about setting client.SceneAgent in AddNewClient()" | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 964cae4f37120db34d0d3e2f08ab998215237dfd. | |||||
| | * | | | | | Committing the Avination calling card module | Melanie | 2012-03-29 | 1 | -0/+286 | |
| | | | | | | | ||||||
| | * | | | | | Pushing the Avination Calling card hooks. Module to follow. | Melanie | 2012-03-29 | 1 | -4/+17 | |
| | | | | | | | ||||||
| * | | | | | | Committing the Avination calling card module | Melanie | 2012-03-28 | 1 | -0/+286 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 9 | -78/+96 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| | * | | | | Add comment about setting client.SceneAgent in AddNewClient() | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Simplify friends caching by only doing this for root agents - no functions ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 7 | -53/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting. | |||||
| | * | | | | HG 2.0 Suitcase inventory: proof of concept now working properly with the ↵ | Diva Canto | 2012-03-28 | 1 | -10/+11 | |
| | | | | | | | | | | | | | | | | | | | | | heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message. | |||||
| | * | | | | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵ | Diva Canto | 2012-03-28 | 2 | -23/+61 | |
| | | | | | | | | | | | | | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -15/+18 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 1 | -0/+48 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | More on switching the root folder from under the viewer. More experiments. | Diva Canto | 2012-03-27 | 2 | -15/+18 | |
| | | | | | | | ||||||
| * | | | | | | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | | Fix typos | Melanie | 2012-03-28 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 6 | -16/+223 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-28 | 5 | -16/+175 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 3 | -2/+120 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -1/+78 | |
| | | | |\ \ \ \ | ||||||
| | | | * | | | | | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -2/+120 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | |||||
| | | * | | | | | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵ | Diva Canto | 2012-03-27 | 2 | -14/+55 | |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | guarded by an obscure config that no one but me should be using at this point. | |||||
| | * | | | | | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2 | Melanie | 2012-03-28 | 1 | -0/+48 | |
| | |/ / / / / | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |